small changes

3 files changed, 13 insertions, 28 deletions

diff --git a/res/layout/activity_start_conversation.xml b/res/layout/activity_start_conversation.xml
index 54341816b..9c757540e 100644
--- a/res/layout/activity_start_conversation.xml
+++ b/res/layout/activity_start_conversation.xml
@@ -2,6 +2,7 @@
 <android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/start_conversation_view_pager"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent"
+    android:background="@color/primarybackground">
 
 </android.support.v4.view.ViewPager>
\ No newline at end of file
diff --git a/res/menu/start_conversation.xml b/res/menu/start_conversation.xml
index 3daff29a3..12109d7b6 100644
--- a/res/menu/start_conversation.xml
+++ b/res/menu/start_conversation.xml
@@ -2,21 +2,23 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <item
+        android:id="@+id/action_search"
+        android:actionViewClass="android.widget.SearchView"
+        android:icon="@drawable/ic_action_search"
+        android:showAsAction="collapseActionView|always"
+        android:title="@string/search"/>
+    
+    <item
         android:id="@+id/action_create_contact"
         android:icon="@drawable/ic_action_add_person"
-        android:showAsAction="ifRoom"
+        android:showAsAction="always"
         android:title="@string/create_contact"/>
     <item
         android:id="@+id/action_create_conference"
         android:icon="@drawable/ic_action_add_group"
-        android:showAsAction="ifRoom"
+        android:showAsAction="always"
         android:title="@string/create_conference"/>
-    <item
-        android:id="@+id/action_search"
-        android:actionViewClass="android.widget.SearchView"
-        android:icon="@drawable/ic_action_search"
-        android:showAsAction="collapseActionView|ifRoom"
-        android:title="@string/search"/>
+    
     <item
         android:id="@+id/action_accounts"
         android:orderInCategory="90"
diff --git a/src/eu/siacs/conversations/ui/StartConversation.java b/src/eu/siacs/conversations/ui/StartConversation.java
index ad129ea09..664e50a8c 100644
--- a/src/eu/siacs/conversations/ui/StartConversation.java
+++ b/src/eu/siacs/conversations/ui/StartConversation.java
@@ -18,7 +18,6 @@ import android.support.v4.view.ViewPager;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.MenuItem.OnActionExpandListener;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -90,19 +89,6 @@ public class StartConversation extends XmppActivity {
 			return true;
 		}
 	};
-	private OnActionExpandListener mOnSearchActionExpandListener = new OnActionExpandListener() {
-
-		@Override
-		public boolean onMenuItemActionExpand(MenuItem item) {
-			return true;
-		}
-
-		@Override
-		public boolean onMenuItemActionCollapse(MenuItem item) {
-			invalidateOptionsMenu();
-			return true;
-		}
-	};
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -176,8 +162,6 @@ public class StartConversation extends XmppActivity {
 		TextView textView = (TextView) mSearchView.findViewById(id);
 		textView.setTextColor(Color.WHITE);
 		mSearchView.setOnQueryTextListener(this.mOnQueryTextListener);
-		menuSearch
-				.setOnActionExpandListener(this.mOnSearchActionExpandListener);
 		return true;
 	}
 
@@ -211,9 +195,7 @@ public class StartConversation extends XmppActivity {
 	}
 
 	private void onTabChanged() {
-		if (mSearchView == null || mSearchView.isIconified()) {
-			invalidateOptionsMenu();
-		}
+		invalidateOptionsMenu();
 	}
 
 	private class ListItemAdapter extends ArrayAdapter<ListItem> {