summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Kover <kover@cyngn.com>2016-02-22 14:33:31 -0800
committerJoey Rizzoli <joey@cyanogenmoditalia.it>2016-10-17 16:40:07 +0200
commitd91a84725f2cb791100feaaf73a7b10ddf608898 (patch)
tree46801411c6c4edaa5a6736f7798e2360528b8ec1
parent6075066405342e77ed57d0aeedef456811df7373 (diff)
downloadandroid_packages_apps_Messaging-d91a84725f2cb791100feaaf73a7b10ddf608898.tar.gz
android_packages_apps_Messaging-d91a84725f2cb791100feaaf73a7b10ddf608898.tar.bz2
android_packages_apps_Messaging-d91a84725f2cb791100feaaf73a7b10ddf608898.zip
Messaging: Switch to mipmap launcher icons
Insert the launcher icon as mipmap. Change references. This commit squashes the following commits from CM 13.0: b6065457580199c897f0970364608540a90c4ef3 Add new colors and icon. 33e931646d82761758478375d13b27d9cd0c3302 Bring back original color Change-Id: Ie7ebc19d71b46a76b4f48f9e5fec1b76ec6dbe5f Ticket: MMS-216
-rwxr-xr-xAndroidManifest.xml2
-rw-r--r--res/layout/widget_conversation.xml2
-rw-r--r--res/mipmap-hdpi/ic_launcher.png (renamed from res/drawable-hdpi/ic_launcher.png)bin2211 -> 2211 bytes
-rw-r--r--res/mipmap-mdpi/ic_launcher.png (renamed from res/drawable-mdpi/ic_launcher.png)bin1433 -> 1433 bytes
-rw-r--r--res/mipmap-xhdpi/ic_launcher.png (renamed from res/drawable-xhdpi/ic_launcher.png)bin2922 -> 2922 bytes
-rw-r--r--res/mipmap-xxhdpi/ic_launcher.png (renamed from res/drawable-xxhdpi/ic_launcher.png)bin4610 -> 4610 bytes
-rw-r--r--res/mipmap-xxxhdpi/ic_launcher.png (renamed from res/drawable-xxxhdpi/ic_launcher.png)bin6200 -> 6200 bytes
7 files changed, 2 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4e22885..b58533c 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -58,7 +58,7 @@
<application
android:name="com.android.messaging.BugleApplication"
android:allowBackup="false"
- android:icon="@drawable/ic_launcher"
+ android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:theme="@style/BugleTheme"
android:supportsRtl="true">
diff --git a/res/layout/widget_conversation.xml b/res/layout/widget_conversation.xml
index a9cda98..eaf1dcf 100644
--- a/res/layout/widget_conversation.xml
+++ b/res/layout/widget_conversation.xml
@@ -39,7 +39,7 @@
android:freezesText="true" />
<ImageView
android:id="@+id/launcher_icon"
- android:src="@drawable/ic_launcher"
+ android:src="@mipmap/ic_launcher"
android:layout_height="wrap_content"
android:layout_width="0dip"
android:layout_weight = "1"
diff --git a/res/drawable-hdpi/ic_launcher.png b/res/mipmap-hdpi/ic_launcher.png
index 5e4e62f..5e4e62f 100644
--- a/res/drawable-hdpi/ic_launcher.png
+++ b/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher.png b/res/mipmap-mdpi/ic_launcher.png
index ef6a3c5..ef6a3c5 100644
--- a/res/drawable-mdpi/ic_launcher.png
+++ b/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher.png b/res/mipmap-xhdpi/ic_launcher.png
index ad1acb4..ad1acb4 100644
--- a/res/drawable-xhdpi/ic_launcher.png
+++ b/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_launcher.png b/res/mipmap-xxhdpi/ic_launcher.png
index de56e98..de56e98 100644
--- a/res/drawable-xxhdpi/ic_launcher.png
+++ b/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_launcher.png b/res/mipmap-xxxhdpi/ic_launcher.png
index 9ac88b4..9ac88b4 100644
--- a/res/drawable-xxxhdpi/ic_launcher.png
+++ b/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ