Use search widget (close kontalk#596)

Signed-off-by: Daniele Ricci <[email protected]>
esraiak · Jan 25, 2016 · fe2a8e0 · fe2a8e0
1 parent 44407c9
commit fe2a8e0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/app/proguard.cfg b/app/proguard.cfg
@@ -107,3 +107,5 @@
 -keepnames class * implements android.os.Parcelable {
     public static final ** CREATOR;
 }
+
+-keep class android.support.v7.widget.SearchView { *; }
diff --git a/app/src/main/java/org/kontalk/ui/ConversationListFragment.java b/app/src/main/java/org/kontalk/ui/ConversationListFragment.java
@@ -32,6 +32,7 @@
 import com.akalipetis.fragment.ActionModeListFragment;
 import com.akalipetis.fragment.MultiChoiceModeListener;
 
+import android.app.SearchManager;
 import android.content.AsyncQueryHandler;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -42,7 +43,9 @@
 import android.database.sqlite.SQLiteDiskIOException;
 import android.database.sqlite.SQLiteException;
 import android.os.Bundle;
+import android.support.v4.view.MenuItemCompat;
 import android.support.v7.view.ActionMode;
+import android.support.v7.widget.SearchView;
 import android.util.Log;
 import android.util.SparseBooleanArray;
 import android.view.LayoutInflater;
@@ -215,7 +218,11 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 
         // search
         mSearchMenu = menu.findItem(R.id.menu_search);
-        //MenuItemCompat.setShowAsAction(mSearchMenu, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+        SearchView searchView = (SearchView) MenuItemCompat.getActionView(mSearchMenu);
+        SearchManager searchManager = (SearchManager) getContext().getSystemService(Context.SEARCH_SERVICE);
+        searchView.setSearchableInfo(searchManager.getSearchableInfo(getActivity().getComponentName()));
+        // LayoutParams.MATCH_PARENT does not work, use a big value instead
+        searchView.setMaxWidth(1000000);
 
         mDeleteAllMenu = menu.findItem(R.id.menu_delete_all);
 
@@ -258,10 +265,6 @@ public void onClick(DialogInterface dialog, int which) {
                 }
                 return true;
 
-            case R.id.menu_search:
-                getActivity().onSearchRequested();
-                return true;
-
             case R.id.menu_delete_all:
                 deleteAll();
                 return true;

diff --git a/app/src/main/res/menu/conversation_list_menu.xml b/app/src/main/res/menu/conversation_list_menu.xml
@@ -20,7 +20,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <!-- actions -->
-    <item android:id="@+id/menu_search" android:title="@string/menu_search" android:icon="@drawable/ic_menu_search" app:showAsAction="always"/>
+    <item android:id="@+id/menu_search" android:title="@string/menu_search" android:icon="@drawable/ic_menu_search"
+        app:actionViewClass="android.support.v7.widget.SearchView" app:showAsAction="collapseActionView|ifRoom"/>
 
     <!-- menu -->
     <item android:id="@+id/menu_offline" android:title="@string/menu_offline" android:icon="@drawable/ic_menu_cancel"/>