diff options
| author | grait <grandhiajit9@gmail.com> | 2014-03-09 14:44:20 +0530 |
|---|---|---|
| committer | grait <grandhiajit9@gmail.com> | 2014-03-09 14:44:20 +0530 |
| commit | 7b8668a7e30bc3eef4aaece87a13ff27fc924e79 (patch) | |
| tree | 61f9fb2d589746a3f7e3aa02922325812ccf0d20 /OpenPGP-Keychain/src/main/res/menu/key_list_public.xml | |
| parent | 3fbda4245cf34d2f8e150e6a26ad4048cdb6b204 (diff) | |
| parent | 50d9908bafd1b55640deb3a0b2cff4e06155cc5e (diff) | |
| download | open-keychain-7b8668a7e30bc3eef4aaece87a13ff27fc924e79.tar.gz open-keychain-7b8668a7e30bc3eef4aaece87a13ff27fc924e79.tar.bz2 open-keychain-7b8668a7e30bc3eef4aaece87a13ff27fc924e79.zip | |
Merge branch 'develop' into master2
Diffstat (limited to 'OpenPGP-Keychain/src/main/res/menu/key_list_public.xml')
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/menu/key_list_public.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenPGP-Keychain/src/main/res/menu/key_list_public.xml b/OpenPGP-Keychain/src/main/res/menu/key_list_public.xml index 35a8f3926..35f4fca92 100644 --- a/OpenPGP-Keychain/src/main/res/menu/key_list_public.xml +++ b/OpenPGP-Keychain/src/main/res/menu/key_list_public.xml @@ -4,7 +4,7 @@ <item android:id="@+id/menu_key_list_public_import" - app:showAsAction="always|withText" + app:showAsAction="ifRoom|withText" android:icon="@drawable/ic_action_add_person" android:title="@string/menu_import" /> <item @@ -16,5 +16,5 @@ android:title="@string/menu_search" android:icon="@drawable/ic_action_search" app:actionViewClass="android.support.v7.widget.SearchView" - app:showAsAction="ifRoom" /> + app:showAsAction="collapseActionView|ifRoom" /> </menu>
\ No newline at end of file |