69f5bf6b57
Conflicts: OpenPGP-Keychain/src/main/AndroidManifest.xml OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml OpenPGP-Keychain/src/main/res/menu/key_list.xml OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml
21 lines
787 B
XML
21 lines
787 B
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_list_import"
|
|
app:showAsAction="ifRoom|withText"
|
|
android:icon="@drawable/ic_action_add_person"
|
|
android:title="@string/menu_import" />
|
|
<item
|
|
android:id="@+id/menu_key_list_export"
|
|
app:showAsAction="never"
|
|
android:title="@string/menu_export_keys" />
|
|
<item
|
|
android:id="@+id/menu_key_list_search"
|
|
android:title="@string/menu_search"
|
|
android:icon="@drawable/ic_action_search"
|
|
app:actionViewClass="android.support.v7.widget.SearchView"
|
|
app:showAsAction="collapseActionView|ifRoom" />
|
|
</menu>
|