Skip to content
Snippets Groups Projects
Commit fe963edd authored by Torsten Grote's avatar Torsten Grote
Browse files

Merge branch '829-new-launcher-icon' into 'master'

Use the new launcher icon

Closes #829

See merge request !515
parents 74f1fa56 96f00606
Branches beta-2017-04-07
No related tags found
Loading
Showing
with 9 additions and 9 deletions
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<application <application
android:name=".android.BriarApplicationImpl" android:name=".android.BriarApplicationImpl"
android:allowBackup="false" android:allowBackup="false"
android:icon="@drawable/ic_launcher" android:icon="@mipmap/ic_launcher_round"
android:label="@string/app_name" android:label="@string/app_name"
android:logo="@mipmap/ic_launcher_round" android:logo="@mipmap/ic_launcher_round"
android:theme="@style/BriarTheme"> android:theme="@style/BriarTheme">
......
briar-android/src/main/res/drawable-hdpi/ic_launcher.png

2.91 KiB

briar-android/src/main/res/drawable-ldpi/ic_launcher.png

1.82 KiB

briar-android/src/main/res/drawable-mdpi/ic_launcher.png

1.65 KiB

briar-android/src/main/res/drawable-xhdpi/ic_launcher.png

3.57 KiB

...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
android:layout_height="@dimen/blogs_avatar_normal_size" android:layout_height="@dimen/blogs_avatar_normal_size"
android:layout_alignTop="@+id/authorName" android:layout_alignTop="@+id/authorName"
android:layout_marginRight="@dimen/margin_medium" android:layout_marginRight="@dimen/margin_medium"
tools:src="@drawable/ic_launcher"/> tools:src="@mipmap/ic_launcher_round"/>
<ImageView <ImageView
android:id="@+id/avatarIcon" android:id="@+id/avatarIcon"
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
android:layout_width="30dp" android:layout_width="30dp"
android:layout_height="30dp" android:layout_height="30dp"
app:civ_border_color="@color/action_bar_text" app:civ_border_color="@color/action_bar_text"
tools:src="@drawable/ic_launcher"/> tools:src="@mipmap/ic_launcher_round"/>
<ImageView <ImageView
android:id="@+id/contactStatus" android:id="@+id/contactStatus"
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
android:layout_marginLeft="@dimen/listitem_horizontal_margin" android:layout_marginLeft="@dimen/listitem_horizontal_margin"
android:layout_marginRight="@dimen/listitem_horizontal_margin" android:layout_marginRight="@dimen/listitem_horizontal_margin"
android:layout_marginStart="@dimen/listitem_horizontal_margin" android:layout_marginStart="@dimen/listitem_horizontal_margin"
tools:src="@drawable/ic_launcher"/> tools:src="@mipmap/ic_launcher_round"/>
<org.thoughtcrime.securesms.components.emoji.EmojiTextView <org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/nameContact1" android:id="@+id/nameContact1"
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
android:layout_marginLeft="@dimen/listitem_horizontal_margin" android:layout_marginLeft="@dimen/listitem_horizontal_margin"
android:layout_marginRight="@dimen/listitem_horizontal_margin" android:layout_marginRight="@dimen/listitem_horizontal_margin"
android:layout_marginStart="@dimen/listitem_horizontal_margin" android:layout_marginStart="@dimen/listitem_horizontal_margin"
tools:src="@drawable/ic_launcher"/> tools:src="@mipmap/ic_launcher_round"/>
<org.thoughtcrime.securesms.components.emoji.EmojiTextView <org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/nameContact2" android:id="@+id/nameContact2"
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
android:layout_width="@dimen/listitem_picture_size" android:layout_width="@dimen/listitem_picture_size"
android:layout_height="@dimen/listitem_picture_size" android:layout_height="@dimen/listitem_picture_size"
android:layout_gravity="bottom|left" android:layout_gravity="bottom|left"
tools:src="@drawable/ic_launcher"/> tools:src="@mipmap/ic_launcher_round"/>
<TextView <TextView
android:id="@+id/unreadCountView" android:id="@+id/unreadCountView"
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/listitem_horizontal_margin" android:layout_marginLeft="@dimen/listitem_horizontal_margin"
android:layout_marginStart="@dimen/listitem_horizontal_margin" android:layout_marginStart="@dimen/listitem_horizontal_margin"
tools:src="@drawable/ic_launcher"/> tools:src="@mipmap/ic_launcher_round"/>
<org.thoughtcrime.securesms.components.emoji.EmojiTextView <org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/nameView" android:id="@+id/nameView"
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_marginEnd="@dimen/listitem_horizontal_margin" android:layout_marginEnd="@dimen/listitem_horizontal_margin"
android:layout_marginRight="@dimen/listitem_horizontal_margin" android:layout_marginRight="@dimen/listitem_horizontal_margin"
tools:src="@drawable/ic_launcher"/> tools:src="@mipmap/ic_launcher_round"/>
<org.thoughtcrime.securesms.components.emoji.EmojiTextView <org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/nameView" android:id="@+id/nameView"
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
tools:src="@drawable/ic_launcher"/> tools:src="@mipmap/ic_launcher_round"/>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment