summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2014-09-17 13:30:07 +0100
committerBen Murdoch <benm@google.com>2014-09-17 13:44:13 +0000
commitbc83039ba42ff6aaef92b6732f9cd59d338d3907 (patch)
tree88bf69ee62e274865f786f3d6a75e0989410e753
parentc1be37a26c62c6bd266bf64d49257d428ae2008c (diff)
downloadandroid_frameworks_webview-bc83039ba42ff6aaef92b6732f9cd59d338d3907.tar.gz
android_frameworks_webview-bc83039ba42ff6aaef92b6732f9cd59d338d3907.tar.bz2
android_frameworks_webview-bc83039ba42ff6aaef92b6732f9cd59d338d3907.zip
Use drawables instead of mipmap for WebView icon.
The WebView doesn't have a need for mip-map icons, so use drawable instead which allows us to strip the unused densities. Bug: 17540943 Change-Id: I9960abc383efc2b0e744f80507c81cf7165ebbfa (cherry picked from commit b1100a8d8e3bf2eb4e29bf11bb8da1677bd99b12)
-rw-r--r--chromium/AndroidManifest.xml2
-rw-r--r--chromium/res/drawable-hdpi/icon_webview.png (renamed from chromium/res/mipmap-hdpi/icon_webview.png)bin13975 -> 13975 bytes
-rw-r--r--chromium/res/drawable-mdpi/icon_webview.png (renamed from chromium/res/mipmap-mdpi/icon_webview.png)bin7151 -> 7151 bytes
-rw-r--r--chromium/res/drawable-xhdpi/icon_webview.png (renamed from chromium/res/mipmap-xhdpi/icon_webview.png)bin21981 -> 21981 bytes
-rw-r--r--chromium/res/drawable-xxhdpi/icon_webview.png (renamed from chromium/res/mipmap-xxhdpi/icon_webview.png)bin37607 -> 37607 bytes
5 files changed, 1 insertions, 1 deletions
diff --git a/chromium/AndroidManifest.xml b/chromium/AndroidManifest.xml
index d2ecac8..8adc119 100644
--- a/chromium/AndroidManifest.xml
+++ b/chromium/AndroidManifest.xml
@@ -20,7 +20,7 @@
android:targetSdkVersion="20">
</uses-sdk>
<application android:label="Android System WebView"
- android:icon="@mipmap/icon_webview"
+ android:icon="@drawable/icon_webview"
android:multiArch="true">
</application>
</manifest>
diff --git a/chromium/res/mipmap-hdpi/icon_webview.png b/chromium/res/drawable-hdpi/icon_webview.png
index 4f9377f..4f9377f 100644
--- a/chromium/res/mipmap-hdpi/icon_webview.png
+++ b/chromium/res/drawable-hdpi/icon_webview.png
Binary files differ
diff --git a/chromium/res/mipmap-mdpi/icon_webview.png b/chromium/res/drawable-mdpi/icon_webview.png
index 9bc6817..9bc6817 100644
--- a/chromium/res/mipmap-mdpi/icon_webview.png
+++ b/chromium/res/drawable-mdpi/icon_webview.png
Binary files differ
diff --git a/chromium/res/mipmap-xhdpi/icon_webview.png b/chromium/res/drawable-xhdpi/icon_webview.png
index 9412fbe..9412fbe 100644
--- a/chromium/res/mipmap-xhdpi/icon_webview.png
+++ b/chromium/res/drawable-xhdpi/icon_webview.png
Binary files differ
diff --git a/chromium/res/mipmap-xxhdpi/icon_webview.png b/chromium/res/drawable-xxhdpi/icon_webview.png
index bd8c447..bd8c447 100644
--- a/chromium/res/mipmap-xxhdpi/icon_webview.png
+++ b/chromium/res/drawable-xxhdpi/icon_webview.png
Binary files differ