UNC: use SearchView in Action bar instead of explicit edit text view

Author: C3C0

res/layout/led_control_activity.xml

@@ -16,18 +16,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:focusable="true"
-    android:focusableInTouchMode="true" >
-
-    <EditText 
-        android:id="@+id/input_search"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/app_picker_search"
-        android:inputType="text"
-        android:saveEnabled="false"
-        android:visibility="gone" />
+    android:orientation="vertical" >
 
     <ListView
         android:id="@android:id/list"

res/menu/led_control_activity_menu.xml

@@ -14,8 +14,17 @@
  * limitations under the License.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item android:id="@+id/search"
+          android:title="@string/search"
+          android:icon="@android:drawable/ic_menu_search"
+          android:showAsAction="collapseActionView|ifRoom"
+          android:actionViewClass="android.widget.SearchView" />
+
     <item android:id="@+id/lc_activity_menu_show_all"
           android:title="@string/lc_activity_menu_show_all" />
+
     <item android:id="@+id/lc_activity_menu_show_active" 
           android:title="@string/lc_activity_menu_show_active" />
+
 </menu>

src/com/ceco/oreo/gravitybox/ledcontrol/LedControlActivity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Peter Gregus for GravityBox Project (C3C076@xda)
+ * Copyright (C) 2018 Peter Gregus for GravityBox Project (C3C076@xda)
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -29,68 +29,94 @@
 import android.content.pm.PackageManager;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
-import android.widget.EditText;
 import android.widget.AdapterView.OnItemClickListener;
+import android.widget.SearchView.OnQueryTextListener;
 import android.widget.ListView;
+import android.widget.SearchView;
 
 public class LedControlActivity extends GravityBoxListActivity implements ListItemActionHandler, OnItemClickListener {
 
     private static final int REQ_SETTINGS = 1;
+    private static final String KEY_ACTIVE_ONLY = "showActiveOnly";
+    private static final String KEY_SEARCH_QUERY = "searchQuery";
 
     private ListView mList;
     private AsyncTask<Void, Void, ArrayList<LedListItem>> mAsyncTask;
     private ProgressDialog mProgressDialog;
     private LedListItem mCurrentItem;
-    private EditText mSearchEditText;
     private boolean mShowActiveOnly;
+    private String mSearchQuery;
+    private SearchView mSearchView;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         if (savedInstanceState != null) {
-            mShowActiveOnly = savedInstanceState.getBoolean("showActiveOnly", false);
+            mShowActiveOnly = savedInstanceState.getBoolean(KEY_ACTIVE_ONLY, false);
+            mSearchQuery = savedInstanceState.getString(KEY_SEARCH_QUERY, null);
         }
 
         setContentView(R.layout.led_control_activity);
 
         mList = getListView();
         mList.setOnItemClickListener(this);
 
-        mSearchEditText = (EditText) findViewById(R.id.input_search);
-        mSearchEditText.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                if (mList.getAdapter() != null) {
-                    ((LedListAdapter)mList.getAdapter()).getFilter().filter(s);
-                }
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) { }
-        });
-
         setData();
     }
 
     @Override
     public void onStop() {
         cancelSetData();
+        mSearchView.clearFocus();
         super.onStop();
     }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.led_control_activity_menu, menu);
+
+        final MenuItem search = menu.findItem(R.id.search);
+        mSearchView = (SearchView) search.getActionView();
+
+        if (mSearchQuery != null) {
+            mSearchView.setQuery(mSearchQuery, false);
+        }
+
+        mSearchView.setOnQueryTextListener(new OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextChange(String text) {
+                mSearchQuery = text;
+                if (mList.getAdapter() != null) {
+                    ((LedListAdapter)mList.getAdapter()).getFilter().filter(mSearchQuery);
+                }
+                return true;
+            }
+            @Override
+            public boolean onQueryTextSubmit(String text) {
+                mSearchView.clearFocus();
+                return true;
+            }
+        });
+
+        int closeBtnResId = getResources().getIdentifier(
+                "android:id/search_close_btn", null, null);
+        if (closeBtnResId != 0) {
+            View closeBtn = mSearchView.findViewById(closeBtnResId);
+            if (closeBtn != null) {
+                closeBtn.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        search.collapseActionView();
+                    }
+                });
+            }
+        }
+
         return true;
     }
 
@@ -139,11 +165,12 @@ protected ArrayList<LedListItem> doInBackground(Void... arg0) {
             @Override
             protected void onPostExecute(ArrayList<LedListItem> result) {
                 dismissProgressDialog();
-                mSearchEditText.setText("");
-                mList.setAdapter(new LedListAdapter(LedControlActivity.this, result, 
-                        LedControlActivity.this));
-                ((LedListAdapter)mList.getAdapter()).notifyDataSetChanged();
-                mSearchEditText.setVisibility(mShowActiveOnly ? View.GONE : View.VISIBLE);
+                LedListAdapter adapter = new LedListAdapter(LedControlActivity.this, result, 
+                        LedControlActivity.this);
+                if (mSearchQuery != null) {
+                    adapter.getFilter().filter(mSearchQuery);
+                }
+                mList.setAdapter(adapter);
             }
         }.execute();
     }
@@ -213,6 +240,10 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
 
     @Override
     public void onSaveInstanceState(Bundle bundle) {
-        bundle.putBoolean("showActiveOnly", mShowActiveOnly);
+        bundle.putBoolean(KEY_ACTIVE_ONLY, mShowActiveOnly);
+        if (mSearchQuery != null) {
+            bundle.putString(KEY_SEARCH_QUERY, mSearchQuery);
+        }
+        super.onSaveInstanceState(bundle);
     }
 }