From c94ef60c5d93d724dad9e4422fdcc3778ade7ae1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 14 Jan 2015 14:02:51 +0100
Subject: Fix SearchView

---
 .../keychain/ui/KeyListFragment.java               | 24 ++++------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
index d0be052d8..7fa403485 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
@@ -110,8 +110,6 @@ public class KeyListFragment extends LoaderFragment
     private String mQuery;
     private SearchView mSearchView;
 
-    boolean hideMenu = false;
-
     /**
      * Load custom layout with StickyListView from library
      */
@@ -172,8 +170,8 @@ public class KeyListFragment extends LoaderFragment
             TextView title = (TextView) getActivity().findViewById(R.id.custom_actionbar_text);
             title.setText(R.string.swipe_to_update);
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-                hideMenu = true;
-                activity.invalidateOptionsMenu();
+//                hideMenu = true;
+//                activity.invalidateOptionsMenu();
             }
         } else {
             bar.setTitle(getActivity().getTitle());
@@ -184,8 +182,8 @@ public class KeyListFragment extends LoaderFragment
             bar.setDisplayShowCustomEnabled(false);
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-                hideMenu = false;
-                activity.invalidateOptionsMenu();
+//                hideMenu = false;
+//                activity.invalidateOptionsMenu();
             }
         }
     }
@@ -470,10 +468,6 @@ public class KeyListFragment extends LoaderFragment
         MenuItemCompat.setOnActionExpandListener(searchItem, new MenuItemCompat.OnActionExpandListener() {
             @Override
             public boolean onMenuItemActionExpand(MenuItem item) {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-                    hideMenu = true;
-                    getActivity().invalidateOptionsMenu();
-                }
 
                 // disable swipe-to-refresh
                 // mSwipeRefreshLayout.setIsLocked(true);
@@ -485,22 +479,12 @@ public class KeyListFragment extends LoaderFragment
                 mQuery = null;
                 getLoaderManager().restartLoader(0, null, KeyListFragment.this);
 
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-                    hideMenu = false;
-                    getActivity().invalidateOptionsMenu();
-                }
                 // enable swipe-to-refresh
                 // mSwipeRefreshLayout.setIsLocked(false);
                 return true;
             }
         });
 
-        if (hideMenu) {
-            for (int i = 0; i < menu.size(); i++) {
-                menu.getItem(i).setVisible(false);
-            }
-        }
-
         super.onCreateOptionsMenu(menu, inflater);
     }
 
-- 
cgit v1.2.3