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

Use the new launcher icon

Closes #829

See merge request !515

briar-android/src/main/AndroidManifest.xml

@@ -23,7 +23,7 @@
 	<application
 		android:name=".android.BriarApplicationImpl"
 		android:allowBackup="false"
-		android:icon="@drawable/ic_launcher"
+		android:icon="@mipmap/ic_launcher_round"
 		android:label="@string/app_name"
 		android:logo="@mipmap/ic_launcher_round"
 		android:theme="@style/BriarTheme">

briar-android/src/main/res/layout/author_view.xml

@@ -11,7 +11,7 @@
 		android:layout_height="@dimen/blogs_avatar_normal_size"
 		android:layout_alignTop="@+id/authorName"
 		android:layout_marginRight="@dimen/margin_medium"
-		tools:src="@drawable/ic_launcher"/>
+		tools:src="@mipmap/ic_launcher_round"/>
 
 	<ImageView
 		android:id="@+id/avatarIcon"

briar-android/src/main/res/layout/contact_avatar_status.xml

@@ -13,7 +13,7 @@
 		android:layout_width="30dp"
 		android:layout_height="30dp"
 		app:civ_border_color="@color/action_bar_text"
-		tools:src="@drawable/ic_launcher"/>
+		tools:src="@mipmap/ic_launcher_round"/>
 
 	<ImageView
 		android:id="@+id/contactStatus"

briar-android/src/main/res/layout/introduction_message.xml

@@ -38,7 +38,7 @@
 						android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 						android:layout_marginRight="@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
 						android:id="@+id/nameContact1"
@@ -77,7 +77,7 @@
 						android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 						android:layout_marginRight="@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
 						android:id="@+id/nameContact2"

briar-android/src/main/res/layout/list_item_contact.xml

@@ -29,7 +29,7 @@
 				android:layout_width="@dimen/listitem_picture_size"
 				android:layout_height="@dimen/listitem_picture_size"
 				android:layout_gravity="bottom|left"
-				tools:src="@drawable/ic_launcher"/>
+				tools:src="@mipmap/ic_launcher_round"/>
 
 			<TextView
 				android:id="@+id/unreadCountView"

briar-android/src/main/res/layout/list_item_contact_small.xml

@@ -16,7 +16,7 @@
 		android:layout_gravity="center_vertical"
 		android:layout_marginLeft="@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
 		android:id="@+id/nameView"

briar-android/src/main/res/layout/list_item_revealable_contact.xml

@@ -25,7 +25,7 @@
 			android:layout_alignParentStart="true"
 			android:layout_marginEnd="@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
 			android:id="@+id/nameView"

briar-android/src/main/res/layout/list_item_selectable_contact.xml

@@ -20,7 +20,7 @@
 			android:layout_alignParentLeft="true"
 			android:layout_alignParentStart="true"
 			android:layout_centerVertical="true"
-			tools:src="@drawable/ic_launcher"/>
+			tools:src="@mipmap/ic_launcher_round"/>
 
 		<LinearLayout
 			android:layout_width="wrap_content"