Skip to content

Commit 5e02715

Browse files
iadmirmoxie0
authored andcommitted
Change the app icon
Closes signalapp#6189
1 parent 3506f2d commit 5e02715

File tree

56 files changed

+27
-40
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+27
-40
lines changed

AndroidManifest.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090

9191
<application android:name=".ApplicationContext"
9292
android:icon="@drawable/icon"
93+
android:roundIcon="@drawable/icon_circle"
9394
android:label="@string/app_name"
9495
android:supportsRtl="true"
9596
tools:replace="android:allowBackup"
@@ -260,7 +261,7 @@
260261
<activity android:name=".PassphraseCreateActivity"
261262
android:label="@string/AndroidManifest__create_passphrase"
262263
android:windowSoftInputMode="stateUnchanged"
263-
android:theme="@style/TextSecure.LightIntroTheme"
264+
android:theme="@style/TextSecure.LightNoActionBar"
264265
android:launchMode="singleTask"
265266
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
266267

artwork/logo-512.png

-9.71 KB
437 Bytes
137 Bytes
675 Bytes
1.97 KB
14.1 KB
14.4 KB

res/drawable-hdpi/icon.png

1.03 KB

res/drawable-hdpi/icon_circle.png

7.16 KB

res/drawable-hdpi/icon_dialog.png

-730 Bytes
7.92 KB
403 Bytes
-316 Bytes
224 Bytes
-47 Bytes
696 Bytes
1.53 KB
14 KB
14.3 KB

res/drawable-mdpi/icon.png

1.19 KB

res/drawable-mdpi/icon_circle.png

4.11 KB

res/drawable-mdpi/icon_dialog.png

14.8 KB
18.7 KB
3.74 KB
3.36 KB
451 Bytes
500 Bytes
2.46 KB
14.1 KB
14.6 KB

res/drawable-xhdpi/icon.png

508 Bytes

res/drawable-xhdpi/icon_circle.png

10.5 KB

res/drawable-xhdpi/icon_dialog.png

-702 Bytes
9.42 KB
14 KB
1.01 KB
14.2 KB
15 KB

res/drawable-xxhdpi/icon.png

-907 Bytes

res/drawable-xxhdpi/icon_circle.png

17.6 KB

res/drawable-xxhdpi/icon_dialog.png

-4.3 KB
28.4 KB
-4.58 KB
344 Bytes
962 Bytes
15.1 KB
17.5 KB

res/drawable-xxxhdpi/icon.png

-1.03 KB

res/drawable-xxxhdpi/icon_circle.png

24.8 KB
32.5 KB
+25-36
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,27 @@
11
<?xml version="1.0" encoding="utf-8"?>
22

3-
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
4-
android:id="@+id/scroll_parent"
5-
android:layout_width="match_parent"
6-
android:layout_height="match_parent"
7-
android:fillViewport="true"
8-
android:background="@drawable/background_pattern_repeat">
9-
10-
<RelativeLayout android:id="@+id/prompt_layout"
11-
android:layout_width="match_parent"
12-
android:layout_height="wrap_content">
13-
14-
<ImageView android:id="@+id/watermark"
15-
android:layout_width="wrap_content"
16-
android:layout_height="wrap_content"
17-
android:layout_centerHorizontal="true"
18-
android:layout_marginBottom="20dp"
19-
android:src="@drawable/lockscreen_watermark_light"
20-
android:contentDescription="@string/PassphrasePromptActivity_watermark_content_description"
21-
android:layout_marginTop="100dp"/>
22-
23-
<RelativeLayout android:layout_width="match_parent"
24-
android:layout_height="wrap_content"
25-
android:layout_below="@id/watermark">
26-
27-
<ProgressBar android:id="@+id/passphrase_edit"
28-
android:layout_width="75dp"
29-
android:layout_height="75dp"
30-
android:indeterminate="true"
31-
android:padding="10dp"
32-
android:layout_centerHorizontal="true"/>
33-
34-
</RelativeLayout>
35-
36-
</RelativeLayout>
37-
38-
</ScrollView>
3+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
4+
android:id="@+id/prompt_layout"
5+
android:layout_width="match_parent"
6+
android:layout_height="match_parent"
7+
android:background="@color/signal_primary">
8+
9+
10+
<ProgressBar android:id="@+id/passphrase_edit"
11+
android:layout_width="75dp"
12+
android:layout_height="75dp"
13+
android:indeterminate="true"
14+
android:padding="10dp"
15+
android:layout_centerInParent="true"
16+
style="?android:attr/progressBarStyleLargeInverse"/>
17+
18+
<ImageView android:id="@+id/watermark"
19+
android:layout_width="wrap_content"
20+
android:layout_height="wrap_content"
21+
android:layout_centerHorizontal="true"
22+
android:layout_marginBottom="20dp"
23+
android:layout_above="@id/passphrase_edit"
24+
android:src="@drawable/icon_transparent"
25+
android:contentDescription="@string/PassphrasePromptActivity_watermark_content_description"/>
26+
27+
</RelativeLayout>

src/org/thoughtcrime/securesms/PassphraseCreateActivity.java

-3
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ public void onCreate(Bundle savedInstanceState) {
4747
}
4848

4949
private void initializeResources() {
50-
getSupportActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
51-
getSupportActionBar().setCustomView(R.layout.centered_app_title);
52-
5350
new SecretGenerator().execute(MasterSecretUtil.UNENCRYPTED_PASSPHRASE);
5451
}
5552

0 commit comments

Comments
 (0)