Change the app icon

Closes #6189

AndroidManifest.xml

@@ -90,6 +90,7 @@
 
     <application android:name=".ApplicationContext"
                  android:icon="@drawable/icon"
+                 android:roundIcon="@drawable/icon_circle"
                  android:label="@string/app_name"
                  android:supportsRtl="true"
                  tools:replace="android:allowBackup"
@@ -260,7 +261,7 @@
     <activity android:name=".PassphraseCreateActivity"
               android:label="@string/AndroidManifest__create_passphrase"
               android:windowSoftInputMode="stateUnchanged"
-              android:theme="@style/TextSecure.LightIntroTheme"
+              android:theme="@style/TextSecure.LightNoActionBar"
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 

res/layout/create_passphrase_activity.xml

@@ -1,38 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            android:id="@+id/scroll_parent"
+                android:id="@+id/prompt_layout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-            android:fillViewport="true"
+                android:background="@color/signal_primary">
-            android:background="@drawable/background_pattern_repeat">
 
-  <RelativeLayout android:id="@+id/prompt_layout"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content">
-
-    <ImageView android:id="@+id/watermark"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:layout_centerHorizontal="true"
-               android:layout_marginBottom="20dp"
-               android:src="@drawable/lockscreen_watermark_light"
-               android:contentDescription="@string/PassphrasePromptActivity_watermark_content_description"
-               android:layout_marginTop="100dp"/>
-
-    <RelativeLayout android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/watermark">
 
   <ProgressBar android:id="@+id/passphrase_edit"
                android:layout_width="75dp"
                android:layout_height="75dp"
                android:indeterminate="true"
                android:padding="10dp"
-                   android:layout_centerHorizontal="true"/>
+               android:layout_centerInParent="true"
+               style="?android:attr/progressBarStyleLargeInverse"/>
 
-    </RelativeLayout>
+  <ImageView android:id="@+id/watermark"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:layout_centerHorizontal="true"
+             android:layout_marginBottom="20dp"
+             android:layout_above="@id/passphrase_edit"
+             android:src="@drawable/icon_transparent"
+             android:contentDescription="@string/PassphrasePromptActivity_watermark_content_description"/>
 
-  </RelativeLayout>
+</RelativeLayout>
-
-</ScrollView>

src/org/thoughtcrime/securesms/PassphraseCreateActivity.java

@@ -47,9 +47,6 @@ public class PassphraseCreateActivity extends PassphraseActivity {
   }
 
   private void initializeResources() {
-    getSupportActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
-    getSupportActionBar().setCustomView(R.layout.centered_app_title);
-
     new SecretGenerator().execute(MasterSecretUtil.UNENCRYPTED_PASSPHRASE);
   }