Don't show search pop up for honeycomb++ search (appears in actionbar instead)

For apps that are Honeycomb+, clicking search was showing 2 search fields: a pop up dialog and a field in the Action Bar.  Search in the ActionBar only happens for Honeycomb+; the popup dialog should only happen for < Honeycomb. This changes the logic to match that: the search dialog will only pop up now when there is no search in the ActionBar.

Author: niftynei

app/src/main/java/com/zulip/android/ZulipActivity.java

@@ -33,7 +33,6 @@
 import android.support.v4.widget.DrawerLayout;
 import android.support.v4.widget.SimpleCursorAdapter;
 import android.util.Log;
-import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -457,8 +456,7 @@ public boolean onPrepareOptionsMenu(Menu menu) {
             searchView.setSearchableInfo(searchManager
                     .getSearchableInfo(getComponentName()));
 
-            searchView
-                    .setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
                         @Override
                         public boolean onQueryTextSubmit(String s) {
                             doNarrow(new NarrowFilterSearch(s));
@@ -494,7 +492,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
                         FragmentManager.POP_BACK_STACK_INCLUSIVE);
                 break;
             case R.id.search:
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+                // show a pop up dialog only if gingerbread or under
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
                     AlertDialog.Builder builder = new AlertDialog.Builder(this);
                     builder.setTitle("Search Zulip");
                     final EditText editText = new EditText(this);