From e39d9652596bda1f1fcef43cafd96e9a627fd58e Mon Sep 17 00:00:00 2001
From: M66B <marcel@faircode.eu>
Date: Sun, 26 Oct 2014 08:05:21 +0100
Subject: [PATCH] Revert "Fixed double tap search"

This reverts commit de2505dfcdcd52472c07d94ce16d33021e8d61b0.

Conflicts:
	CHANGELOG.md

Refs #2043
---
 CHANGELOG.md                                | 3 +++
 res/menu/main.xml                           | 2 +-
 src/biz/bokhorst/xprivacy/ActivityMain.java | 3 +--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0fc5a0621..9f9c343c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,8 +31,11 @@ See for more information about XPrivacy 3 [this FAQ](https://github.com/M66B/XPr
 **Version 3.4.12 BETA**
 
 * Usage data for functions which cannot be restricted
+<<<<<<< HEAD
 * Fixed double tap search
 * Allow more identification functions to be restricted for XPrivacy itself
+=======
+>>>>>>> parent of de2505d... Fixed double tap search
 * Updated French translation
 
 **Version 3.4.11 BETA**
diff --git a/res/menu/main.xml b/res/menu/main.xml
index f861050c9..cdd719dfd 100644
--- a/res/menu/main.xml
+++ b/res/menu/main.xml
@@ -7,7 +7,7 @@
         android:id="@+id/menu_search"
         android:icon="@android:drawable/ic_menu_search"
         android:title="@android:string/search_go"
-        app:actionViewClass="android.support.v7.widget.SearchView"
+        app:actionViewClass="android.widget.SearchView"
         app:showAsAction="collapseActionView|always"/>
     <item
         android:id="@+id/menu_sort"
diff --git a/src/biz/bokhorst/xprivacy/ActivityMain.java b/src/biz/bokhorst/xprivacy/ActivityMain.java
index 9978e1638..3d8961da8 100644
--- a/src/biz/bokhorst/xprivacy/ActivityMain.java
+++ b/src/biz/bokhorst/xprivacy/ActivityMain.java
@@ -38,7 +38,6 @@
 import android.os.Handler;
 import android.os.Process;
 import android.support.v4.view.MenuItemCompat;
-import android.support.v7.widget.SearchView;
 import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.util.Log;
@@ -72,6 +71,7 @@
 import android.widget.RadioGroup;
 import android.widget.RelativeLayout;
 import android.widget.ScrollView;
+import android.widget.SearchView;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -489,7 +489,6 @@ public boolean onCreateOptionsMenu(Menu menu) {
 			// Searchable
 			SearchView searchView = (SearchView) MenuItemCompat.getActionView(menu.findItem(R.id.menu_search));
 			if (searchView != null) {
-				searchView.setIconifiedByDefault(false);
 				searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
 					@Override
 					public boolean onQueryTextChange(String newText) {