Bumping version to 0.9.9.6

1) Allow imports from the stock SMS database at any time.

2) Provide plaintext export support, in a format compatible with
   the "SMS Backup And Restore" app.

3) Fix the DB weirdness on encrypted restore that previously
   required killing the app.

AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.thoughtcrime.securesms"
-      android:versionCode="47"
-      android:versionName="0.9.9.1">
+      android:versionCode="52"
+      android:versionName="0.9.9.6">
 
     <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="16"/>
 
@@ -10,19 +10,19 @@
                 android:label="Access to TextSecure Secrets"
                 android:protectionLevel="signature" />    
     
-	<uses-permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"></uses-permission>
-    <uses-permission android:name="android.permission.READ_PROFILE"></uses-permission>
-    <uses-permission android:name="android.permission.WRITE_PROFILE"></uses-permission>	
-    <uses-permission android:name="android.permission.BROADCAST_WAP_PUSH"></uses-permission>
-    <uses-permission android:name="android.permission.READ_CONTACTS"></uses-permission>
-    <uses-permission android:name="android.permission.WRITE_CONTACTS"></uses-permission>
+	<uses-permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"/>
+    <uses-permission android:name="android.permission.READ_PROFILE"/>
+    <uses-permission android:name="android.permission.WRITE_PROFILE"/>
+    <uses-permission android:name="android.permission.BROADCAST_WAP_PUSH"/>
+    <uses-permission android:name="android.permission.READ_CONTACTS"/>
+    <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.RECEIVE_SMS"></uses-permission>
-    <uses-permission android:name="android.permission.RECEIVE_MMS"></uses-permission>
-    <uses-permission android:name="android.permission.READ_SMS"></uses-permission>
-    <uses-permission android:name="android.permission.SEND_SMS"></uses-permission>
-    <uses-permission android:name="android.permission.WRITE_SMS"></uses-permission>
-    <uses-permission android:name="android.permission.VIBRATE"></uses-permission>
+    <uses-permission android:name="android.permission.RECEIVE_SMS"/>
+    <uses-permission android:name="android.permission.RECEIVE_MMS"/>
+    <uses-permission android:name="android.permission.READ_SMS"/>
+    <uses-permission android:name="android.permission.SEND_SMS"/>
+    <uses-permission android:name="android.permission.WRITE_SMS"/>
+    <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
@@ -40,7 +40,7 @@
         
     <application android:icon="@drawable/icon"
                  android:label="@string/app_name"
-                 android:theme="@style/Theme.Sherlock.Light.DarkActionBar">
+                 android:theme="@style/TextSecure.LightTheme">
 
         <activity android:name=".RoutingActivity"
                   android:theme="@style/NoAnimation.Theme.Sherlock.Light.DarkActionBar"            
@@ -68,12 +68,15 @@
             </intent-filter>            
             
         </activity>
-        
+
+    <activity android:name=".ImportExportActivity"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
     <activity android:name=".PromptApnActivity"
               android:label="Configure MMS Settings"
               android:windowSoftInputMode="stateUnchanged"              
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-             
+
     <activity android:name=".ConversationListActivity"
               android:label="@string/app_name"
               android:launchMode="singleTask"
@@ -118,7 +121,6 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".ViewIdentityActivity"
-              android:theme="@style/Theme.Sherlock.Light.Dialog"
               android:label="@string/AndroidManifest__public_identity_key"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
@@ -135,12 +137,6 @@
               android:label="@string/AndroidManifest__verify_identity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".SaveIdentityActivity"
-              android:theme="@style/Theme.Sherlock.Light.Dialog"
-              android:label="@string/AndroidManifest__save_identity"
-              android:windowSoftInputMode="stateVisible"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
     <activity android:name=".ReviewIdentitiesActivity"
               android:label="@string/AndroidManifest__manage_identity_keys"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
@@ -153,11 +149,6 @@
     <activity android:name=".ApplicationPreferencesActivity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".VerifyImportedIdentityActivity" 
-              android:theme="@style/Theme.Sherlock.Light.Dialog" 
-              android:label="@string/AndroidManifest__verify_imported_identity" 
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
     <activity android:name=".RegistrationActivity"
               android:windowSoftInputMode="stateUnchanged"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
@@ -216,6 +207,14 @@
               </intent-filter>              
     </receiver>
 
+    <receiver android:name=".notifications.MarkReadReceiver"
+              android:enabled="true"
+              android:exported="true">
+        <intent-filter>
+            <action android:name="org.thoughtcrime.securesms.notifications.CLEAR"></action>
+        </intent-filter>
+    </receiver>
+
     <provider android:name=".providers.PartProvider" 
               android:authorities="org.thoughtcrime.provider.securesms" />
 

BUILDING.md

@@ -0,0 +1,22 @@
+Building TextSecure
+===================
+
+Fetch ActionBarSherlock:
+
+    git clone --branch 4.2.0 git://github.com/JakeWharton/ActionBarSherlock.git ../ActionBarSherlock
+
+Configure ActionBarSherlock for your android target:
+
+    android update project --path ../ActionBarSherlock/library --target 1
+
+Configure TextSecure for your android target, linking to ASB:
+
+    android update project --path . --target 1 --library ../ActionBarSherlock/library
+
+Finally, both codebases must share the android-support jar. As TextSecure's is newer, use it:
+
+    cp libs/android-support-v4.jar ../ActionBarSherlock/library/libs/android-support-v4.jar
+
+Assuming your android toolchain is correctly configured, it should now be possible to build the TextSecure apk.
+
+    ant debug

res/drawable/clickable_card.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@android:drawable/list_selector_background"
+          android:state_pressed="true" />
+    <item android:drawable="@drawable/card" />
+</selector>

res/drawable/conversation_list_item_background_read.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     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
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true"
-        android:drawable="@android:color/transparent" />
-    <item android:state_pressed="true" android:state_selected="false"
-        android:drawable="@android:color/transparent" />
-    <item android:state_selected="false" android:state_activated="false"
-        android:drawable="@color/read_bgcolor" />
-    <item android:state_activated="true"
-        android:drawable="@drawable/list_selector_background_selected" />
-</selector>

res/drawable/conversation_list_item_background_read_dark.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true"
+          android:drawable="@android:color/transparent" />
+    <item android:state_pressed="true" android:state_selected="false"
+          android:drawable="@android:color/transparent" />
+    <item android:state_selected="false" android:state_activated="false"
+          android:drawable="@color/conversation_list_item_background_read_dark" />
+    <item android:state_activated="true"
+          android:drawable="@drawable/list_selector_background_selected" />
+</selector>

res/drawable/conversation_list_item_background_read_light.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true"
+        android:drawable="@android:color/transparent" />
+    <item android:state_pressed="true" android:state_selected="false"
+        android:drawable="@android:color/transparent" />
+    <item android:state_selected="false" android:state_activated="false"
+        android:drawable="@color/conversation_list_item_background_read_light" />
+    <item android:state_activated="true"
+        android:drawable="@drawable/list_selector_background_selected" />
+</selector>

res/drawable/conversation_list_item_background_unread.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     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
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true"
-        android:drawable="@android:color/transparent" />
-    <item android:state_pressed="true" android:state_selected="false"
-        android:drawable="@android:color/transparent" />
-    <item android:state_selected="false" android:state_activated="false"
-        android:drawable="@color/unread_bgcolor" />
-    <item android:state_activated="true"
-        android:drawable="@drawable/list_selector_background_selected" />
-</selector>

res/drawable/conversation_list_item_background_unread_dark.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true"
+          android:drawable="@android:color/transparent" />
+    <item android:state_pressed="true" android:state_selected="false"
+          android:drawable="@android:color/transparent" />
+    <item android:state_selected="false" android:state_activated="false"
+          android:drawable="@color/conversation_list_item_background_unread_dark" />
+    <item android:state_activated="true"
+          android:drawable="@drawable/list_selector_background_selected" />
+</selector>

res/drawable/conversation_list_item_background_unread_light.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true"
+        android:drawable="@android:color/transparent" />
+    <item android:state_pressed="true" android:state_selected="false"
+        android:drawable="@android:color/transparent" />
+    <item android:state_selected="false" android:state_activated="false"
+        android:drawable="@color/conversation_list_item_background_unread_light" />
+    <item android:state_activated="true"
+        android:drawable="@drawable/list_selector_background_selected" />
+</selector>

res/layout/conversation_activity.xml

@@ -18,7 +18,7 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:orientation="vertical"
-        android:background="@drawable/white_background"
+        android:background="?conversation_background"
         android:gravity="bottom">
 
         <fragment
@@ -38,7 +38,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:paddingBottom="5dip"
-                android:background="#fff">
+                android:background="?conversation_background">
 
                <LinearLayout
                  android:id="@+id/attachment_editor"
@@ -51,7 +51,8 @@
                     android:id="@+id/attachment_thumbnail"
                     android:layout_width="fill_parent"
                     android:layout_height="150dip"
-                    android:layout_weight="1" />
+                    android:layout_weight="1"
+                    android:contentDescription="Attachment Thumbnail"/>
 
                 <LinearLayout
                     android:orientation="vertical"
@@ -70,9 +71,9 @@
 
            </LinearLayout>
 
-            <View android:background="#eeeeee"
-                android:layout_width="match_parent"
-                android:layout_height="1dp" />
+            <View android:background="?conversation_editor_background"
+                  android:layout_width="match_parent"
+                  android:layout_height="1dp" />
 
                 <LinearLayout
                     android:id="@+id/bottom_panel"
@@ -97,7 +98,7 @@
                         android:maxLength="1000"
                         android:maxLines="4"
                         android:nextFocusRight="@+id/send_button"
-                        android:textColor="@android:color/black" />
+                        android:textColor="?conversation_editor_text_color" />
 
                     <ImageButton
                         android:id="@+id/send_button"
@@ -108,19 +109,17 @@
                         android:contentDescription="@string/conversation_activity__send"
                         android:nextFocusLeft="@+id/embedded_text_editor"
                         android:padding="12dp"
-                        android:src="@drawable/ic_send_holo_light"
+                        android:src="?conversation_send_button"
                         android:clickable="false"
                         android:enabled="false" />
-<!--                        android:tint="#66ffffff" />-->
 
-"
+
                 </LinearLayout>
-                       <TextView android:id="@+id/space_left"
-                                    android:paddingLeft="5dip"
-                                     android:layout_width="fill_parent"
-                                     android:layout_height="wrap_content"
-                                     android:text="160/160 (1)"
-                            />
+               <TextView android:id="@+id/space_left"
+                         android:paddingLeft="5dip"
+                         android:layout_width="fill_parent"
+                         android:layout_height="wrap_content"
+                         android:text="160/160 (1)" />
             </LinearLayout>
         </ScrollView>
     </RelativeLayout>

res/layout/conversation_item_received.xml

@@ -9,8 +9,9 @@
 
     <RelativeLayout
                   android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="horizontal">
+                  android:layout_height="fill_parent"
+                  android:orientation="horizontal"
+                  android:background="?conversation_card_background">
 
         <view  xmlns:android="http://schemas.android.com/apk/res/android"
                class="org.thoughtcrime.securesms.components.ImageDivet"
@@ -20,14 +21,15 @@
                android:layout_width="60dp"
                android:layout_height="60dp"
                android:cropToPadding="true"
-               android:layout_marginRight="10dip"
                android:scaleType="centerCrop" />
 
         <LinearLayout android:id="@+id/conversation_item_parent"
                       android:layout_width="fill_parent"
-                      android:layout_height="wrap_content"
+                      android:layout_height="match_parent"
                       android:layout_toLeftOf="@+id/indicators_parent"
                       android:layout_toRightOf="@id/contact_photo"
+                      android:background="?conversation_background"
+                      android:paddingLeft="10dip"
                       android:orientation="vertical" >
 
             <TextView android:id="@+id/conversation_item_body"
@@ -35,14 +37,16 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:linksClickable="true"
+                android:paddingTop="5dip"
                 android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="#ff000000"
+                android:textColor="?conversation_text_primary_color"
                 android:textSize="16sp" />
 
             <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/mms_view"
                 android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
                 android:paddingTop="7dip"
                 android:paddingBottom="7dip">
 
@@ -54,7 +58,8 @@
                     android:scaleType="centerInside"
                     android:adjustViewBounds="true"
                     android:background="@android:drawable/picture_frame"
-                    android:visibility="gone" />
+                    android:visibility="gone"
+                    android:contentDescription="Message Media"/>
 
                 <ImageButton
                     android:id="@+id/play_slideshow_button"
@@ -62,7 +67,8 @@
                     android:layout_height="wrap_content"
                     android:src="@drawable/mms_play_btn"
                     android:layout_gravity="center"
-                    android:visibility="gone" />
+                    android:visibility="gone"
+                    android:contentDescription="Play Button"/>
 
             </FrameLayout>
 
@@ -91,16 +97,18 @@
             </LinearLayout>
 
             <LinearLayout android:layout_width="fill_parent"
-                          android:layout_height="wrap_content"
+                          android:layout_height="match_parent"
                           android:orientation="horizontal"
+                          android:paddingTop="5dip"
                           android:gravity="left">
 
               <ImageView android:id="@+id/delivered_indicator"
                          android:layout_width="wrap_content"
                          android:layout_height="wrap_content"
                          android:paddingRight="3dip"
-                         android:src="@drawable/ic_sms_mms_delivered"
-                         android:visibility="gone" />                
+                         android:src="?conversation_delivered_indicator"
+                         android:visibility="gone"
+                         android:contentDescription="Delivered Indicator"/>
                               
 		      <TextView android:id="@+id/group_message_status"
 		                android:layout_width="wrap_content"
@@ -108,7 +116,7 @@
 		                android:linksClickable="false"
 		                android:textAppearance="?android:attr/textAppearanceSmall"
 		                android:layout_gravity="left"
-		                android:textColor="#ffcccccc"
+		                android:textColor="?conversation_text_secondary_color"
 		                android:visibility="gone"
 		                android:layout_marginRight="8dip"
 		                android:paddingTop="1dip"/>                
@@ -120,7 +128,7 @@
 		                android:linksClickable="false"
 		                android:textAppearance="?android:attr/textAppearanceSmall"
 		                android:layout_gravity="left"
-		                android:textColor="#ffcccccc"
+		                android:textColor="?conversation_text_secondary_color"
 		                android:paddingTop="1dip"/>
 		      </LinearLayout>             
              
@@ -128,34 +136,35 @@
 
        <LinearLayout android:id="@+id/indicators_parent"
                       android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layout_centerVertical="true"
+                      android:layout_height="fill_parent"
                       android:orientation="vertical"
-                      android:layout_alignParentRight="true">
+                      android:layout_alignParentRight="true"
+                      android:gravity="center_vertical"
+                      android:background="?conversation_background">
 
             <ImageView
                 android:id="@+id/key_exchange_indicator"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
                 android:src="@drawable/ic_menu_login"
-                android:visibility="gone" />
+                android:visibility="gone"
+                android:contentDescription="Key Exchange Indicator"/>
 
             <ImageView
                 android:id="@+id/sms_secure_indicator"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
                 android:src="@drawable/ic_menu_lock_holo_light"
-                android:visibility="gone" />
+                android:visibility="gone"
+                android:contentDescription="Secure Message Indicator"/>
 
             <ImageView
                 android:id="@+id/sms_failed_indicator"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
                 android:src="@drawable/ic_list_alert_sms_failed"
-                android:visibility="gone" />
+                android:visibility="gone"
+                android:contentDescription="Send Failed Indicator"/>
         </LinearLayout>
 
     </RelativeLayout>

res/layout/conversation_item_sent.xml

@@ -7,48 +7,51 @@
     android:paddingLeft="10dip"
     android:orientation="horizontal">
 
-    <RelativeLayout
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="horizontal">
+    <RelativeLayout android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="horizontal"
+                    android:background="?conversation_card_background">
 
         <LinearLayout android:id="@+id/indicators_parent"
                       android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
+                      android:layout_height="match_parent"
                       android:orientation="vertical"
-                      android:layout_centerVertical="true"
-                      android:layout_alignParentLeft="true">
+                      android:layout_alignParentLeft="true"
+                      android:gravity="center_vertical"
+                      android:background="?conversation_background">
 
             <ImageView
                 android:id="@+id/key_exchange_indicator"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
                 android:src="@drawable/ic_menu_login"
-                android:visibility="gone" />
+                android:visibility="gone"
+                android:contentDescription="Key Exchange Indicator"/>
 
             <ImageView
                 android:id="@+id/sms_secure_indicator"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
                 android:src="@drawable/ic_menu_lock_holo_light"
-                android:visibility="gone" />
+                android:visibility="gone"
+                android:contentDescription="Secure Message Indicator"/>
 
             <ImageView
                 android:id="@+id/sms_failed_indicator"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
                 android:src="@drawable/ic_list_alert_sms_failed"
-                android:visibility="gone" />
+                android:visibility="gone"
+                android:contentDescription="Send Failed Indicator"/>
         </LinearLayout>
 
         <LinearLayout android:id="@+id/conversation_item_parent"
                       android:layout_width="fill_parent"
-                      android:layout_height="wrap_content"
+                      android:layout_height="match_parent"
                       android:layout_toRightOf="@id/indicators_parent"
                       android:layout_toLeftOf="@+id/contact_photo"
+                      android:background="?conversation_background"
+                      android:paddingRight="10dip"
                       android:orientation="vertical" >
 
             <TextView android:id="@+id/conversation_item_body"
@@ -56,15 +59,17 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:linksClickable="true"
+                android:paddingTop="5dip"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:gravity="right"
-                android:textColor="#ff000000"
+                android:textColor="?conversation_text_primary_color"
                 android:textSize="16sp" />
 
             <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/mms_view"
                 android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
                 android:paddingTop="7dip"
                 android:paddingBottom="7dip">
 
@@ -76,7 +81,8 @@
                         android:scaleType="centerInside"
                         android:adjustViewBounds="true"
                         android:background="@android:drawable/picture_frame"
-                        android:visibility="gone" />
+                        android:visibility="gone"
+                        android:contentDescription="Media Message"/>
 
                 <ImageButton
                     android:id="@+id/play_slideshow_button"
@@ -84,7 +90,8 @@
                     android:layout_height="wrap_content"
                     android:src="@drawable/mms_play_btn"
                     android:layout_gravity="center"
-                    android:visibility="gone" />
+                    android:visibility="gone"
+                    android:contentDescription="Play Button"/>
 
             </FrameLayout>
 
@@ -113,16 +120,18 @@
             </LinearLayout>
 
             <LinearLayout android:layout_width="fill_parent"
-                          android:layout_height="wrap_content"
+                          android:layout_height="match_parent"
                           android:orientation="horizontal"
+                          android:paddingTop="5dip"
                           android:gravity="right">
 
               <ImageView android:id="@+id/delivered_indicator"
                          android:layout_width="wrap_content"
                          android:layout_height="wrap_content"
                          android:paddingRight="3dip"
-                         android:src="@drawable/ic_sms_mms_delivered"
-                         android:visibility="gone" />                
+                         android:src="?conversation_delivered_indicator"
+                         android:visibility="gone"
+                         android:contentDescription="Delivered Indicator"/>
                 
 		      <TextView android:id="@+id/group_message_status"
 		                android:layout_width="wrap_content"
@@ -130,7 +139,7 @@
 		                android:linksClickable="false"
 		                android:textAppearance="?android:attr/textAppearanceSmall"
 		                android:layout_gravity="right"
-		                android:textColor="#ffcccccc"
+		                android:textColor="?conversation_text_secondary_color"
 		                android:visibility="gone"
 		                android:layout_marginRight="8dip"
 		                android:paddingTop="1dip"/>
@@ -142,7 +151,7 @@
 		                android:linksClickable="false"
 		                android:textAppearance="?android:attr/textAppearanceSmall"
 		                android:layout_gravity="right"
-		                android:textColor="#ffcccccc"
+		                android:textColor="?conversation_text_secondary_color"
 		                android:paddingTop="1dip"/>                
                 
             </LinearLayout>
@@ -158,7 +167,6 @@
                android:layout_width="60dp"
                android:layout_height="60dp"
                android:cropToPadding="true"
-               android:layout_marginLeft="10dip"
                android:layout_marginRight="0dip"
                android:padding="0dip"
                android:scaleType="centerCrop" />

res/layout/conversation_list_activity.xml

@@ -1,13 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
+<android.support.v4.widget.DrawerLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/drawer_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
     <fragment
-        android:id="@+id/fragment_content"
-        android:name="org.thoughtcrime.securesms.ConversationListFragment"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent" />
+            android:id="@+id/fragment_content"
+            android:name="org.thoughtcrime.securesms.ConversationListFragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
 
-</LinearLayout>
+    <ListView android:id="@+id/left_drawer"
+              android:layout_width="240dp"
+              android:layout_height="match_parent"
+              android:layout_gravity="start"
+              android:choiceMode="singleChoice"
+              android:dividerHeight="1dp"
+              android:background="?navigation_drawer_background"/>
+</android.support.v4.widget.DrawerLayout>

res/layout/conversation_list_item_view.xml

@@ -1,34 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.thoughtcrime.securesms.ConversationListItem xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:paddingRight="10dip"
-    >
+<org.thoughtcrime.securesms.ConversationListItem
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content">
 
-    <FrameLayout android:id="@+id/contact_photo_frame" 
-                 android:layout_width="wrap_content" 
+    <FrameLayout android:id="@+id/contact_photo_frame"
+                 android:layout_width="wrap_content"
                  android:layout_height="wrap_content"
                  android:layout_centerVertical="true"
                  android:layout_alignParentLeft="true"
                  android:visibility="visible">
+
 	    <QuickContactBadge android:id="@+id/contact_photo_badge"
 	                       style="?android:attr/quickContactBadgeStyleWindowLarge"
 	                       android:visibility="gone" />
-	
+
 	    <ImageView android:id="@+id/contact_photo_image"
 	               android:layout_width="60dp"
 	               android:layout_height="60dp"
 	               android:cropToPadding="true"
-	               android:scaleType="centerCrop" 
-	               android:visibility="gone" />    	        
+	               android:scaleType="centerCrop"
+	               android:visibility="gone"
+                   android:contentDescription="Contact Photo Image"/>
     </FrameLayout>
-    
-    <CheckBox android:id="@+id/checkbox"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_alignParentRight="true"
-              android:layout_alignParentTop="true"
-              android:visibility="gone" />
+
+    <!--<CheckBox android:id="@+id/checkbox"-->
+              <!--android:layout_width="wrap_content"-->
+              <!--android:layout_height="wrap_content"-->
+              <!--android:layout_alignParentRight="true"-->
+              <!--android:layout_alignParentTop="true"-->
+              <!--android:visibility="gone" />-->
 
     <TextView android:id="@+id/from"
         android:layout_width="wrap_content"
@@ -37,24 +38,25 @@
         android:singleLine="true"
         android:layout_marginTop="6dip"
         android:layout_marginRight="5dip"
-        android:layout_marginLeft="5dip"
+        android:layout_marginLeft="10dip"
+        android:layout_marginBottom="10dip"
         android:layout_alignTop="@id/contact_photo_frame"
         android:layout_toRightOf="@id/contact_photo_frame"
-        android:layout_toLeftOf="@id/checkbox"
         android:layout_alignWithParentIfMissing="true"
-        android:ellipsize="marquee"
-        android:textColor="#000000"/>
+        android:ellipsize="marquee"/>
+    <!--android:layout_toLeftOf="@id/checkbox"-->
 
 
     <TextView android:id="@+id/date"
         android:layout_marginBottom="10dip"
         android:layout_marginLeft="5dip"
+        android:paddingRight="10dip"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textColor="?android:attr/textColorSecondary"
         android:singleLine="true"
-        android:layout_alignBottom="@id/contact_photo_frame"        
+        android:layout_alignBottom="@id/contact_photo_frame"
         android:layout_alignParentRight="true"/>
 
     <ImageView android:id="@+id/error"
@@ -64,7 +66,8 @@
         android:layout_alignBottom="@id/date"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:src="@drawable/ic_list_alert_sms_failed" />
+        android:src="@drawable/ic_list_alert_sms_failed"
+        android:contentDescription="Error Alert"/>
 
      <ImageView android:id="@+id/attachment"
         android:layout_marginLeft="3dip"
@@ -73,7 +76,8 @@
         android:visibility="gone"
         android:layout_toLeftOf="@id/error"
         android:layout_alignBottom="@id/date"
-        android:src="@drawable/ic_attachment_universal_small" />
+        android:src="@drawable/ic_attachment_universal_small"
+        android:contentDescription="Attachment Indicator"/>
 
     <TextView android:id="@+id/subject"
         android:layout_width="wrap_content"
@@ -81,7 +85,7 @@
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:singleLine="true"
         android:layout_marginBottom="10dip"
-        android:layout_marginLeft="5dip"
+        android:layout_marginLeft="10dip"
         android:layout_alignBottom="@id/contact_photo_frame"
         android:layout_toRightOf="@id/contact_photo_frame"
         android:layout_toLeftOf="@id/date"

res/layout/export_fragment.xml

@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="#ffeaeaea"
+            android:layout_gravity="center_vertical"
+            android:gravity="center_vertical">
+
+    <LinearLayout android:orientation="vertical"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:gravity="center_vertical"
+                  android:layout_gravity="center_vertical"
+                  android:padding="8dip"
+                  android:background="#ffeaeaea">
+
+
+        <LinearLayout android:id="@+id/export_encrypted_backup"
+                      android:clickable="true"
+                      android:layout_width="match_parent"
+                      android:layout_height="wrap_content"
+                      android:layout_marginTop="10dip"
+                      android:background="@drawable/clickable_card"
+                      android:orientation="vertical">
+
+            <LinearLayout android:orientation="horizontal"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:gravity="center_vertical"
+                          android:paddingTop="8dip"
+                          android:paddingBottom="8dip"
+                          android:layout_marginLeft="16dip"
+                          android:layout_marginRight="16dip">
+
+                <ImageView android:layout_width="wrap_content"
+                           android:layout_height="wrap_content"
+                           android:layout_marginRight="10dip"
+                           android:src="@drawable/encrypted_backup"/>
+
+                <LinearLayout android:orientation="vertical"
+                              android:layout_width="wrap_content"
+                              android:layout_height="wrap_content">
+
+                    <TextView android:layout_width="match_parent"
+                              android:layout_height="wrap_content"
+                              style="@style/Registration.Description"
+                              android:text="@string/export_fragment__export_encrypted_backup"/>
+
+                    <TextView android:layout_width="match_parent"
+                              android:layout_height="wrap_content"
+                              android:textAppearance="?android:attr/textAppearanceSmall"
+                              android:text="@string/export_fragment__export_an_encrypted_backup_to_the_sd_card"/>
+
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+
+
+        <LinearLayout android:id="@+id/export_plaintext_backup"
+                      android:clickable="true"
+                      android:layout_width="match_parent"
+                      android:layout_height="wrap_content"
+                      android:layout_marginTop="10dip"
+                      android:background="@drawable/clickable_card"
+                      android:orientation="vertical">
+
+            <LinearLayout android:orientation="horizontal"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:gravity="center_vertical"
+                          android:paddingTop="8dip"
+                          android:paddingBottom="8dip"
+                          android:layout_marginLeft="16dip"
+                          android:layout_marginRight="16dip">
+
+                <ImageView android:layout_width="wrap_content"
+                           android:layout_height="wrap_content"
+                           android:layout_marginRight="10dip"
+                           android:src="@drawable/plaintext_backup"/>
+
+                <LinearLayout android:orientation="vertical"
+                              android:layout_width="wrap_content"
+                              android:layout_height="wrap_content">
+
+                    <TextView android:layout_width="match_parent"
+                              android:layout_height="wrap_content"
+                              style="@style/Registration.Description"
+                              android:text="@string/export_fragment__export_plaintext_backup"/>
+
+                    <TextView android:layout_width="match_parent"
+                              android:layout_height="wrap_content"
+                              android:textAppearance="?android:attr/textAppearanceSmall"
+                              android:text="@string/export_fragment__export_a_plaintext_backup_compatible_with"/>
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+</ScrollView>

res/layout/icon_list_item.xml

@@ -18,7 +18,7 @@
     <TextView android:id="@+id/text1"
         android:layout_width="wrap_content"
         android:layout_height="fill_parent"
-        android:textColor="@drawable/text_color_black"
+        android:textColor="@color/black"
         android:gravity="center_vertical"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:layout_gravity="center_horizontal|center_vertical" />

res/layout/identity_key_view.xml

@@ -1,9 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.IdentityKeyView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
-    android:orientation="horizontal"
-    android:padding="15dip">
+                                            android:layout_width="fill_parent"
+                                            android:layout_height="wrap_content"
+                                            android:paddingRight="10dip">
+
+    <FrameLayout android:id="@+id/contact_photo_frame"
+                 android:layout_width="wrap_content"
+                 android:layout_height="wrap_content"
+                 android:layout_centerVertical="true"
+                 android:layout_alignParentLeft="true"
+                 android:visibility="visible">
+        <QuickContactBadge android:id="@+id/contact_photo_badge"
+                           style="?android:attr/quickContactBadgeStyleWindowLarge"
+                           android:visibility="gone" />
+
+        <ImageView android:id="@+id/contact_photo_image"
+                   android:layout_width="60dp"
+                   android:layout_height="60dp"
+                   android:cropToPadding="true"
+                   android:scaleType="centerCrop"
+                   android:visibility="gone" />
+    </FrameLayout>
 
     <TextView android:id="@+id/identity_name"
               android:layout_width="wrap_content"
@@ -13,8 +30,22 @@
               android:layout_marginTop="6dip"
               android:layout_marginRight="5dip"
               android:layout_marginLeft="5dip"
+              android:layout_alignTop="@id/contact_photo_frame"
+              android:layout_toRightOf="@id/contact_photo_frame"
+              android:layout_alignWithParentIfMissing="true"
               android:ellipsize="marquee"
-              android:layout_alignParentLeft="true"
-              android:layout_centerVertical="true" />
+              android:textColor="#000000"/>
 
-</org.thoughtcrime.securesms.IdentityKeyView>
+    <TextView android:id="@+id/fingerprint"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:textAppearance="?android:attr/textAppearanceSmall"
+              android:singleLine="true"
+              android:layout_marginBottom="10dip"
+              android:layout_marginLeft="5dip"
+              android:layout_alignBottom="@id/contact_photo_frame"
+              android:layout_toRightOf="@id/contact_photo_frame"
+              android:layout_toLeftOf="@id/date"
+              android:ellipsize="end" />
+
+</org.thoughtcrime.securesms.IdentityKeyView>

res/layout/import_export_activity.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.view.ViewPager
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/import_export_pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />

res/layout/import_fragment.xml

@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="#ffeaeaea"
+            android:layout_gravity="center_vertical"
+            android:gravity="center_vertical">
+
+<LinearLayout android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:gravity="center_vertical"
+              android:layout_gravity="center_vertical"
+              android:padding="8dip"
+              android:background="#ffeaeaea">
+
+    <LinearLayout android:id="@+id/import_sms"
+                  android:clickable="true"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:background="@drawable/clickable_card"
+                  android:orientation="vertical">
+
+        <LinearLayout android:orientation="horizontal"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:gravity="center_vertical"
+                      android:paddingTop="8dip"
+                      android:paddingBottom="8dip"
+                      android:layout_marginLeft="16dip"
+                      android:layout_marginRight="16dip">
+
+            <ImageView android:layout_width="wrap_content"
+                       android:layout_height="wrap_content"
+                       android:layout_marginRight="10dip"
+                       android:src="@drawable/stock_sms"/>
+
+            <LinearLayout android:orientation="vertical"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content">
+
+                <TextView android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                          style="@style/Registration.Description"
+                          android:text="@string/import_fragment__import_system_sms_database"/>
+
+                <TextView android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                          android:textAppearance="?android:attr/textAppearanceSmall"
+                          android:text="@string/import_fragment__import_the_database_from_the_default_system"/>
+
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout android:id="@+id/import_encrypted_backup"
+                  android:clickable="true"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:layout_marginTop="10dip"
+                  android:background="@drawable/clickable_card"
+                  android:orientation="vertical">
+
+        <LinearLayout android:orientation="horizontal"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:gravity="center_vertical"
+                      android:paddingTop="8dip"
+                      android:paddingBottom="8dip"
+                      android:layout_marginLeft="16dip"
+                      android:layout_marginRight="16dip">
+
+            <ImageView android:layout_width="wrap_content"
+                       android:layout_height="wrap_content"
+                       android:layout_marginRight="10dip"
+                       android:src="@drawable/encrypted_backup"/>
+
+            <LinearLayout android:orientation="vertical"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content">
+
+                <TextView android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                          style="@style/Registration.Description"
+                          android:text="@string/import_fragment__import_encrypted_backup"/>
+
+                <TextView android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                          android:textAppearance="?android:attr/textAppearanceSmall"
+                          android:text="@string/import_fragment__restore_a_previously_exported_encrypted_textsecure_backup"/>
+
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+
+
+    <LinearLayout android:id="@+id/import_plaintext_backup"
+                  android:clickable="true"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:layout_marginTop="10dip"
+                  android:background="@drawable/clickable_card"
+                  android:orientation="vertical">
+
+        <LinearLayout android:orientation="horizontal"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:gravity="center_vertical"
+                      android:paddingTop="8dip"
+                      android:paddingBottom="8dip"
+                      android:layout_marginLeft="16dip"
+                      android:layout_marginRight="16dip">
+
+            <ImageView android:layout_width="wrap_content"
+                       android:layout_height="wrap_content"
+                       android:layout_marginRight="10dip"
+                       android:src="@drawable/plaintext_backup"/>
+
+            <LinearLayout android:orientation="vertical"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content">
+
+                <TextView android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                          style="@style/Registration.Description"
+                          android:text="@string/import_fragment__import_plaintext_backup"/>
+
+                <TextView android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                          android:textAppearance="?android:attr/textAppearanceSmall"
+                          android:text="@string/import_fragment__import_a_plaintext_backup_file"/>
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
+</ScrollView>

res/layout/navigation_drawer_item.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="horizontal"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:gravity="center_vertical"
+              android:minHeight="48dp">
+
+    <ImageView android:id="@+id/navigation_icon"
+               android:layout_width="wrap_content"
+               android:layout_height="wrap_content"
+               android:layout_marginRight="12dip"
+               android:layout_marginLeft="16dip"
+               android:contentDescription="Navigation Image"/>
+
+    <TextView android:id="@+id/navigation_text"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:textAppearance="?android:attr/textAppearanceMedium"
+              android:layout_marginRight="26dp"
+              android:textColor="?navigation_drawer_text_color"/>
+
+</LinearLayout>

res/layout/receive_key_activity.xml

@@ -1,59 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView android:id="@+id/ScrollView" 
-			android:layout_width="fill_parent" 
-			android:layout_height="fill_parent"
-			xmlns:android="http://schemas.android.com/apk/res/android">
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:fillViewport="true"
+        android:background="@drawable/background_pattern_repeat">
 
-<LinearLayout 
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:padding="10dip">
+    <FrameLayout
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:gravity="center">
 
-	<TextView android:id="@+id/description_text"
-			  android:layout_width="fill_parent"
-			  android:layout_height="wrap_content"
-			  android:textSize="17dip"
-			  android:layout_marginBottom="5dip" />
-			  
-	<TextView android:id="@+id/signature_text"
-			  android:layout_width="fill_parent"
-			  android:layout_height="wrap_content"
-			  android:textSize="17dip"
-			  android:textStyle="italic"
-			  android:layout_marginBottom="10dip" />
-			  
-	<LinearLayout android:layout_width="fill_parent"
-				  android:layout_height="wrap_content"
-				  android:orientation="horizontal">
-				  
-		<Button android:id="@+id/verify_session_button"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="@string/receive_key_activity__session"
-				android:visibility="gone"
-				android:gravity="center" />		  
+        <LinearLayout android:paddingRight="16dip"
+                      android:paddingLeft="16dip"
+                      android:paddingTop="10dip"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:layout_gravity="center"
+                      android:orientation="vertical">
 
-		<Button android:id="@+id/verify_identity_button"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="@string/receive_key_activity__identities"
-				android:visibility="gone"
-				android:gravity="center" />		  
-				  
-		<Button android:id="@+id/ok_button"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="@string/receive_key_activity__complete_exchange"
-				android:gravity="center"/>
-				
-		<Button android:id="@+id/cancel_button"
-				android:text="@android:string/cancel"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:gravity="center"/>
-	</LinearLayout>
-</LinearLayout>
+            <TextView style="@style/Registration.Description"
+                      android:id="@+id/description_text"
+                      android:layout_width="fill_parent"
+                      android:layout_marginBottom="16dip"
+                      android:layout_marginTop="16dip"/>
+
+            <LinearLayout android:layout_height="wrap_content"
+                          android:layout_width="match_parent"
+                          android:layout_marginBottom="7dip"
+                          android:orientation="horizontal">
+
+                <Button android:id="@+id/cancel_button"
+                        android:text="@android:string/cancel"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"/>
+
+                <Button android:id="@+id/ok_button"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@string/receive_key_activity__complete"/>
+            </LinearLayout>
+        </LinearLayout>
+    </FrameLayout>
 </ScrollView>
 
 

res/layout/recipients_panel.xml

@@ -8,7 +8,7 @@
         android:paddingBottom="5dip"
         android:paddingLeft="5dip"
         android:paddingRight="5dip"
-        android:background="@drawable/white_background"
+        android:background="?conversation_background"
         android:orientation="vertical" >
 
         <org.thoughtcrime.securesms.contacts.RecipientsEditor android:id="@+id/recipients_text"

res/layout/review_identities.xml

@@ -1,24 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="fill_parent"
+             android:layout_height="fill_parent">
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical"
-        android:paddingLeft="16dip"
-        android:paddingRight="16dip">
-
-        <ListView android:id="@android:id/list"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:drawSelectorOnTop="false"
-            android:scrollbarStyle="insideOverlay"
-            android:fadingEdgeLength="16dip" />
-
-        <TextView android:id="@id/android:empty"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:text="@string/review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database"
-                  android:textAppearance="?android:attr/textAppearanceMedium"
-                  android:padding="20dip" />
-
- </LinearLayout>
+    <fragment android:id="@+id/fragment_content"
+              android:name="org.thoughtcrime.securesms.ReviewIdentitiesFragment"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"/>
+</FrameLayout>

res/layout/review_identities_fragment.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:orientation="vertical">
+
+    <ListView android:id="@android:id/list"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:drawSelectorOnTop="false"
+              android:scrollbarStyle="insideOverlay"
+              android:fadingEdgeLength="16dip" />
+
+    <TextView android:id="@id/android:empty"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:text="@string/review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database"
+              android:textAppearance="?android:attr/textAppearanceMedium"
+              android:padding="20dip" />
+
+</LinearLayout>

res/layout/save_identity_activity.xml

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical" >
-
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="5dip"
-        android:layout_marginLeft="16dip"
-        android:layout_marginRight="16dip"
-        android:layout_marginTop="5dip"
-        android:text="@string/save_identity_activity__identity_name"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-    <EditText
-        android:id="@+id/identity_name"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="16dip"
-        tools:ignore="TextFields" />
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="16dip"
-        android:gravity="right"
-        android:orientation="horizontal" >
-
-        <TableLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:stretchColumns="*"
-            tools:ignore="UselessParent" >
-
-            <TableRow>
-
-                <Button
-                    android:id="@+id/cancel_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="16dip"
-                    android:layout_marginRight="15dip"
-                    android:text="@android:string/cancel" />
-
-                <Button
-                    android:id="@+id/ok_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="16dip"
-                    android:text="@android:string/ok" />
-            </TableRow>
-        </TableLayout>
-    </LinearLayout>
-
-</LinearLayout>

res/layout/verify_imported_identity_activity.xml

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent">
-<TableLayout 
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:shrinkColumns="1">
-
-    <TableRow>
-        <TextView
-        	android:textSize="12sp"
-            android:text="@string/verify_import_identity_activity__identity_name_n"
-            android:padding="3dip" />
-        <EditText
-        	android:id="@+id/identity_name"
-            android:text=""
-            android:padding="3dip" />
-    </TableRow>
-
-
-    <TableRow>
-        <TextView
-        	android:textSize="12sp"
-            android:text="@string/verify_import_identity_activity__imported_identity_n"
-            android:padding="3dip" />
-        <TextView
-           	android:textSize="20sp"
-           	android:typeface="monospace"        
-        	android:id="@+id/imported_identity"
-            android:text=""
-            android:padding="3dip" />
-    </TableRow>
-    
-    <TableRow>
-    	<LinearLayout android:orientation="horizontal"
-    				  android:layout_width="fill_parent"
-    				  android:layout_height="wrap_content"
-    				  android:layout_gravity="center"
-    				  android:layout_span="2">
-
-	   		<Button android:id="@+id/verified_button"
-	   				android:padding="15dip"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="@string/verify_import_identity_activity__verified"/>
-
-	   		<Button android:id="@+id/compare_button"
-	   				android:padding="15dip"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="@string/verify_import_identity_activity__compare"/>
-						
-			<Button android:id="@+id/cancel_button"
-					android:padding="15dip"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="@android:string/cancel" />
-		</LinearLayout>
-    
-    </TableRow>    
-    
-</TableLayout>
-</ScrollView>