summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Newberger <alann@google.com>2014-09-11 14:39:22 -0700
committerAlan Newberger <alann@google.com>2014-09-11 14:39:22 -0700
commitca5173d84722383d2d9ef49dd85fba28af035429 (patch)
tree30dbff53aa53777a84e72992b3f3977f78c1420d
parent45f316bcecb8713cbb217507981fd657fcdaa274 (diff)
downloadandroid_packages_apps_Camera2-ca5173d84722383d2d9ef49dd85fba28af035429.tar.gz
android_packages_apps_Camera2-ca5173d84722383d2d9ef49dd85fba28af035429.tar.bz2
android_packages_apps_Camera2-ca5173d84722383d2d9ef49dd85fba28af035429.zip
Move launcher icons to mipmap
Bug: 17457682 Change-Id: I6a626c8547f3eea8a06fc47fc70c1a587767b040
-rw-r--r--AndroidManifest.xml2
-rw-r--r--res_p/mipmap-hdpi/logo_camera_color_44in48dp.png (renamed from res_p/drawable-hdpi/logo_camera_color_44in48dp.png)bin4740 -> 4740 bytes
-rw-r--r--res_p/mipmap-mdpi/logo_camera_color_44in48dp.png (renamed from res_p/drawable-mdpi/logo_camera_color_44in48dp.png)bin2928 -> 2928 bytes
-rw-r--r--res_p/mipmap-xhdpi/logo_camera_color_44in48dp.png (renamed from res_p/drawable-xhdpi/logo_camera_color_44in48dp.png)bin6848 -> 6848 bytes
-rw-r--r--res_p/mipmap-xxhdpi/logo_camera_color_44in48dp.png (renamed from res_p/drawable-xxhdpi/logo_camera_color_44in48dp.png)bin11187 -> 11187 bytes
-rw-r--r--res_p/mipmap-xxxhdpi/logo_camera_color_44in48dp.png (renamed from res_p/drawable-xxxhdpi/logo_camera_color_44in48dp.png)bin16099 -> 16099 bytes
6 files changed, 1 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 435c48e8e..e187f99fd 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -42,7 +42,7 @@
<application
android:name="com.android.camera.app.CameraApp"
android:hardwareAccelerated="true"
- android:icon="@drawable/logo_camera_color_44in48dp"
+ android:icon="@mipmap/logo_camera_color_44in48dp"
android:label="@string/app_name"
android:largeHeap="true"
android:restoreAnyVersion="true"
diff --git a/res_p/drawable-hdpi/logo_camera_color_44in48dp.png b/res_p/mipmap-hdpi/logo_camera_color_44in48dp.png
index 1ac6b5840..1ac6b5840 100644
--- a/res_p/drawable-hdpi/logo_camera_color_44in48dp.png
+++ b/res_p/mipmap-hdpi/logo_camera_color_44in48dp.png
Binary files differ
diff --git a/res_p/drawable-mdpi/logo_camera_color_44in48dp.png b/res_p/mipmap-mdpi/logo_camera_color_44in48dp.png
index 3868f159c..3868f159c 100644
--- a/res_p/drawable-mdpi/logo_camera_color_44in48dp.png
+++ b/res_p/mipmap-mdpi/logo_camera_color_44in48dp.png
Binary files differ
diff --git a/res_p/drawable-xhdpi/logo_camera_color_44in48dp.png b/res_p/mipmap-xhdpi/logo_camera_color_44in48dp.png
index 7593dc3f8..7593dc3f8 100644
--- a/res_p/drawable-xhdpi/logo_camera_color_44in48dp.png
+++ b/res_p/mipmap-xhdpi/logo_camera_color_44in48dp.png
Binary files differ
diff --git a/res_p/drawable-xxhdpi/logo_camera_color_44in48dp.png b/res_p/mipmap-xxhdpi/logo_camera_color_44in48dp.png
index a989efe02..a989efe02 100644
--- a/res_p/drawable-xxhdpi/logo_camera_color_44in48dp.png
+++ b/res_p/mipmap-xxhdpi/logo_camera_color_44in48dp.png
Binary files differ
diff --git a/res_p/drawable-xxxhdpi/logo_camera_color_44in48dp.png b/res_p/mipmap-xxxhdpi/logo_camera_color_44in48dp.png
index 9264c3417..9264c3417 100644
--- a/res_p/drawable-xxxhdpi/logo_camera_color_44in48dp.png
+++ b/res_p/mipmap-xxxhdpi/logo_camera_color_44in48dp.png
Binary files differ