Switch to Contextual Action Bar goodness.

res/layout/conversation_fragment_cab.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal">
+
+    <TextView
+        android:id="@+id/title"
+        android:text="Batch Selection Mode"
+        android:maxLines="1"
+        android:singleLine="true"
+        android:layout_gravity="center_vertical"
+        android:layout_centerVertical="true"
+        android:textAppearance="?android:attr/textAppearanceMediumInverse"
+        android:layout_weight="1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:id="@+id/selected_conv_count"
+        android:maxLines="1"
+        android:singleLine="true"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textColor="#ccffffff"
+        android:layout_gravity="center_vertical"
+        android:paddingRight="10dip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>

res/layout/conversation_header_view.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.thoughtcrime.securesms.ConversationHeaderView xmlns:android="http://schemas.android.com/apk/res/android"
+<org.thoughtcrime.securesms.ConversationListItem xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="?android:attr/listPreferredItemHeight"
     android:paddingRight="10dip"
@@ -81,4 +81,4 @@
         android:layout_toLeftOf="@id/date"
         android:ellipsize="end" />
 
-</org.thoughtcrime.securesms.ConversationHeaderView>
+</org.thoughtcrime.securesms.ConversationListItem>

res/menu/conversation_list_batch.xml

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:title="Normal Mode"
-          android:id="@+id/menu_normal_mode"
-          android:icon="@android:drawable/ic_menu_set_as" />
 
     <item android:title="Delete Selected"
           android:id="@+id/menu_delete_selected"
@@ -11,10 +8,10 @@
 
     <item android:title="Select All"
           android:id="@+id/menu_select_all"
-          android:icon="@android:drawable/ic_menu_add" />
+          android:icon="@drawable/ic_menu_selectall_holo_dark" />
 
-    <item android:title="Unselect All"
-          android:id="@+id/menu_unselect_all"
-          android:icon="@android:drawable/ic_menu_revert" />
+<!--     <item android:title="Unselect All" -->
+<!--           android:id="@+id/menu_unselect_all" -->
+<!--           android:icon="@android:drawable/ic_menu_revert" /> -->
 
 </menu>

res/menu/conversation_list_context.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:title="View Thread"
-          android:id="@+id/menu_context_view" />
-
-    <item android:title="Delete Thread"
-          android:id="@+id/menu_context_delete" />
-
-</menu>

res/menu/conversation_list_locked.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:title="Batch Mode"
-          android:id="@+id/menu_batch_mode"
-          android:icon="@android:drawable/ic_menu_share" />
-
-</menu>