summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Daichi Hirono <hirono@google.com> 2016-03-23 14:40:05 +0900
committer Daichi Hirono <hirono@google.com> 2016-03-23 14:40:05 +0900
commit8ba9f4b0118f73bbe3426d564a622471067557fe (patch)
tree2f6eed3cb047dc260690c0395f3f45cd713c5864
parent95184030f9d93e95af68158a151ae4a67beb45e0 (diff)
Use mipmap instead of drawable for app icon of DocumentsUI.
App icon can be redered in various size and mipmap automatically switches to high-resolution resources regardless of screen size when the icon is rendered in large size. BUG=27804140 Change-Id: Ib14a4d8ec8ac601f46510ad50ab18f28408b8fc1
-rw-r--r--AndroidManifest.xml4
-rw-r--r--res/drawable/ic_files_app.xml5
-rw-r--r--res/mipmap-hdpi/ic_launcher_download.png (renamed from res/drawable-hdpi/ic_launcher_download.png)bin4473 -> 4473 bytes
-rw-r--r--res/mipmap-mdpi/ic_launcher_download.png (renamed from res/drawable-mdpi/ic_launcher_download.png)bin2818 -> 2818 bytes
-rw-r--r--res/mipmap-xhdpi/ic_launcher_download.png (renamed from res/drawable-xhdpi/ic_launcher_download.png)bin6351 -> 6351 bytes
-rw-r--r--res/mipmap-xxhdpi/ic_launcher_download.png (renamed from res/drawable-xxhdpi/ic_launcher_download.png)bin10361 -> 10361 bytes
-rw-r--r--res/mipmap-xxxhdpi/ic_launcher_download.png (renamed from res/drawable-xxxhdpi/ic_launcher_download.png)bin14962 -> 14962 bytes
7 files changed, 2 insertions, 7 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index be0838579..14609b21d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -44,7 +44,7 @@
<activity
android:name=".LauncherActivity"
android:theme="@android:style/Theme.NoDisplay"
- android:icon="@drawable/ic_files_app"
+ android:icon="@mipmap/ic_launcher_download"
android:label="@string/downloads_label">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -55,7 +55,7 @@
<activity
android:name=".FilesActivity"
android:theme="@style/DocumentsTheme"
- android:icon="@drawable/ic_files_app"
+ android:icon="@mipmap/ic_launcher_download"
android:label="@string/downloads_label"
android:documentLaunchMode="intoExisting">
<intent-filter>
diff --git a/res/drawable/ic_files_app.xml b/res/drawable/ic_files_app.xml
deleted file mode 100644
index 76e3ba6a8..000000000
--- a/res/drawable/ic_files_app.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_launcher_download"
- android:tint="?android:attr/colorControlNormal"
- android:autoMirrored="true" />
diff --git a/res/drawable-hdpi/ic_launcher_download.png b/res/mipmap-hdpi/ic_launcher_download.png
index f958bbd3c..f958bbd3c 100644
--- a/res/drawable-hdpi/ic_launcher_download.png
+++ b/res/mipmap-hdpi/ic_launcher_download.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_download.png b/res/mipmap-mdpi/ic_launcher_download.png
index f2e937663..f2e937663 100644
--- a/res/drawable-mdpi/ic_launcher_download.png
+++ b/res/mipmap-mdpi/ic_launcher_download.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher_download.png b/res/mipmap-xhdpi/ic_launcher_download.png
index 4dc533638..4dc533638 100644
--- a/res/drawable-xhdpi/ic_launcher_download.png
+++ b/res/mipmap-xhdpi/ic_launcher_download.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_launcher_download.png b/res/mipmap-xxhdpi/ic_launcher_download.png
index 871629096..871629096 100644
--- a/res/drawable-xxhdpi/ic_launcher_download.png
+++ b/res/mipmap-xxhdpi/ic_launcher_download.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_launcher_download.png b/res/mipmap-xxxhdpi/ic_launcher_download.png
index f5be21991..f5be21991 100644
--- a/res/drawable-xxxhdpi/ic_launcher_download.png
+++ b/res/mipmap-xxxhdpi/ic_launcher_download.png
Binary files differ