a6e25e6448
Merge Linked Identities. Also includes an important fix for OperationHelper ids, which had an error in the bit mask logic. Conflicts: Graphics/update-drawables.sh OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java OpenKeychain/src/main/res/anim/fade_in.xml OpenKeychain/src/main/res/anim/fade_out.xml OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml OpenKeychain/src/main/res/layout/view_key_fragment.xml OpenKeychain/src/main/res/menu/key_view.xml OpenKeychain/src/main/res/values/strings.xml OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java README.md
52 lines
1.6 KiB
XML
52 lines
1.6 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:app="http://schemas.android.com/apk/res-auto">
|
|
|
|
<item
|
|
android:id="@+id/menu_key_view_edit"
|
|
android:icon="@drawable/ic_mode_edit_white_24dp"
|
|
android:visible="false"
|
|
app:showAsAction="always"
|
|
android:title="@string/key_view_action_edit" />
|
|
|
|
<item
|
|
android:id="@+id/menu_key_view_refresh"
|
|
android:icon="@drawable/ic_refresh_white_24dp"
|
|
app:showAsAction="always"
|
|
android:title="@string/key_view_action_update" />
|
|
|
|
<item
|
|
android:id="@+id/menu_key_view_export_file"
|
|
app:showAsAction="never"
|
|
android:title="@string/menu_export_key" />
|
|
|
|
<item
|
|
android:id="@+id/menu_key_view_delete"
|
|
android:icon="@drawable/ic_delete_grey_24dp"
|
|
app:showAsAction="never"
|
|
android:title="@string/menu_delete_key" />
|
|
|
|
<item
|
|
android:id="@+id/menu_key_view_advanced"
|
|
app:showAsAction="never"
|
|
android:title="@string/menu_advanced" />
|
|
|
|
<item
|
|
android:id="@+id/menu_key_view_certify_fingerprint"
|
|
app:showAsAction="never"
|
|
android:visible="false"
|
|
android:title="@string/menu_certify_fingerprint" />
|
|
|
|
<item
|
|
android:id="@+id/menu_key_view_certify_fingerprint_word"
|
|
app:showAsAction="never"
|
|
android:visible="false"
|
|
android:title="@string/menu_certify_fingerprint_word" />
|
|
|
|
<item
|
|
android:id="@+id/menu_key_view_add_linked_identity"
|
|
app:showAsAction="never"
|
|
android:title="@string/menu_linked_add_identity" />
|
|
|
|
</menu>
|