moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-18 06:45:03 -05:00
Code Issues Releases Wiki Activity

Merge pull request #369 from hav3n/branch-fixes

Browse Source 
Fix for #347
This commit is contained in:
Dominik Schürmann 2014-03-09 02:05:23 +01:00
commit 50d9908baf
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
View File

@ -375,6 +375,7 @@ public class KeyListPublicFragment extends Fragment implements SearchView.OnQuer
// Execute this when searching // Execute this when searching
mSearchView.setOnQueryTextListener(this); mSearchView.setOnQueryTextListener(this);
super.onCreateOptionsMenu(menu, inflater); super.onCreateOptionsMenu(menu, inflater);
} }

4
OpenPGP-Keychain/src/main/res/menu/key_list_public.xml
View File

@ -4,7 +4,7 @@
<item <item
android:id="@+id/menu_key_list_public_import" android:id="@+id/menu_key_list_public_import"
app:showAsAction="always|withText" app:showAsAction="ifRoom|withText"
android:icon="@drawable/ic_action_add_person" android:icon="@drawable/ic_action_add_person"
android:title="@string/menu_import" /> android:title="@string/menu_import" />
<item <item
@ -16,5 +16,5 @@
android:title="@string/menu_search" android:title="@string/menu_search"
android:icon="@drawable/ic_action_search" android:icon="@drawable/ic_action_search"
app:actionViewClass="android.support.v7.widget.SearchView" app:actionViewClass="android.support.v7.widget.SearchView"
app:showAsAction="ifRoom" /> app:showAsAction="collapseActionView|ifRoom" />
</menu> </menu>