fix channel back button if searchview is expanded

Tribler · Jul 27, 2016 · ea40365 · ea40365
1 parent 61f9be4
commit ea40365
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 19 deletions.
diff --git a/android/TriblerApp/app/src/main/java/org/tribler/android/ChannelActivity.java b/android/TriblerApp/app/src/main/java/org/tribler/android/ChannelActivity.java
@@ -71,6 +71,9 @@ public boolean onCreateOptionsMenu(Menu menu) {
         MenuItem btnFilter = menu.findItem(R.id.btn_filter);
         SearchView searchView = (SearchView) btnFilter.getActionView();
 
+        // Set search hint
+        searchView.setQueryHint(getText(R.string.action_search_in_channel));
+
         // Get list filter
         final Filter filter = _fragment.getAdapter().getFilter();
 
@@ -92,18 +95,4 @@ public void onError(Throwable e) {
 
         return true;
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void onBackPressed() {
-        // Close search if open
-        SearchView searchView = (SearchView) findViewById(R.id.btn_filter);
-        if (!searchView.isIconified()) {
-            searchView.setIconified(true);
-        } else {
-            super.onBackPressed();
-        }
-    }
 }
diff --git a/android/TriblerApp/app/src/main/java/org/tribler/android/MainActivity.java b/android/TriblerApp/app/src/main/java/org/tribler/android/MainActivity.java
@@ -23,7 +23,6 @@
 import android.widget.Toast;
 
 import com.cantrowitz.rxbroadcast.RxBroadcast;
-import com.facebook.stetho.Stetho;
 
 import org.tribler.android.restapi.IRestApi;
 import org.tribler.android.restapi.TriblerService;
@@ -93,7 +92,7 @@ protected void onCreate(Bundle savedInstanceState) {
         drawer.addDrawerListener(_navToggle);
         _navToggle.syncState();
 
-        Stetho.initializeWithDefaults(getApplicationContext()); //DEBUG
+        //Stetho.initializeWithDefaults(getApplicationContext()); //DEBUG
 
         initConnectionManager();
         initService();

diff --git a/android/TriblerApp/app/src/main/res/menu/menu_channel.xml b/android/TriblerApp/app/src/main/res/menu/menu_channel.xml
@@ -6,8 +6,9 @@
 
     <item
         android:id="@+id/btn_filter"
+        android:icon="@drawable/ic_action_search"
         android:title="@string/action_search_in_channel"
         app:actionViewClass="android.support.v7.widget.SearchView"
-        app:showAsAction="always" />
+        app:showAsAction="always|collapseActionView" />
 
 </menu>
diff --git a/android/TriblerApp/app/version.properties b/android/TriblerApp/app/version.properties
@@ -1,2 +1,2 @@
-#Wed Jul 27 21:43:02 CEST 2016
-VERSION_CODE=494
+#Wed Jul 27 22:17:54 CEST 2016
+VERSION_CODE=507