diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-09 02:05:23 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-09 02:05:23 +0100 |
| commit | 50d9908bafd1b55640deb3a0b2cff4e06155cc5e (patch) | |
| tree | 08a5f27d95d481008836c0d05ca866d06239b4fe | |
| parent | 5b255a263ff6dfbc2518e527466dc98aabf2cace (diff) | |
| parent | 14b38078115ab285b6c681c09fb1635fe98708b4 (diff) | |
| download | open-keychain-50d9908bafd1b55640deb3a0b2cff4e06155cc5e.tar.gz open-keychain-50d9908bafd1b55640deb3a0b2cff4e06155cc5e.tar.bz2 open-keychain-50d9908bafd1b55640deb3a0b2cff4e06155cc5e.zip | |
Merge pull request #369 from hav3n/branch-fixes
Fix for #347
| -rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java | 1 | ||||
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/menu/key_list_public.xml | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java index f14fadd77..40a016f55 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java @@ -375,6 +375,7 @@ public class KeyListPublicFragment extends Fragment implements SearchView.OnQuer // Execute this when searching mSearchView.setOnQueryTextListener(this); + super.onCreateOptionsMenu(menu, inflater); } 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 |