From ca5173d84722383d2d9ef49dd85fba28af035429 Mon Sep 17 00:00:00 2001
From: Alan Newberger <alann@google.com>
Date: Thu, 11 Sep 2014 14:39:22 -0700
Subject: Move launcher icons to mipmap

Bug: 17457682
Change-Id: I6a626c8547f3eea8a06fc47fc70c1a587767b040
---
 AndroidManifest.xml                                   |   2 +-
 res_p/drawable-hdpi/logo_camera_color_44in48dp.png    | Bin 4740 -> 0 bytes
 res_p/drawable-mdpi/logo_camera_color_44in48dp.png    | Bin 2928 -> 0 bytes
 res_p/drawable-xhdpi/logo_camera_color_44in48dp.png   | Bin 6848 -> 0 bytes
 res_p/drawable-xxhdpi/logo_camera_color_44in48dp.png  | Bin 11187 -> 0 bytes
 res_p/drawable-xxxhdpi/logo_camera_color_44in48dp.png | Bin 16099 -> 0 bytes
 res_p/mipmap-hdpi/logo_camera_color_44in48dp.png      | Bin 0 -> 4740 bytes
 res_p/mipmap-mdpi/logo_camera_color_44in48dp.png      | Bin 0 -> 2928 bytes
 res_p/mipmap-xhdpi/logo_camera_color_44in48dp.png     | Bin 0 -> 6848 bytes
 res_p/mipmap-xxhdpi/logo_camera_color_44in48dp.png    | Bin 0 -> 11187 bytes
 res_p/mipmap-xxxhdpi/logo_camera_color_44in48dp.png   | Bin 0 -> 16099 bytes
 11 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 res_p/drawable-hdpi/logo_camera_color_44in48dp.png
 delete mode 100644 res_p/drawable-mdpi/logo_camera_color_44in48dp.png
 delete mode 100644 res_p/drawable-xhdpi/logo_camera_color_44in48dp.png
 delete mode 100644 res_p/drawable-xxhdpi/logo_camera_color_44in48dp.png
 delete mode 100644 res_p/drawable-xxxhdpi/logo_camera_color_44in48dp.png
 create mode 100644 res_p/mipmap-hdpi/logo_camera_color_44in48dp.png
 create mode 100644 res_p/mipmap-mdpi/logo_camera_color_44in48dp.png
 create mode 100644 res_p/mipmap-xhdpi/logo_camera_color_44in48dp.png
 create mode 100644 res_p/mipmap-xxhdpi/logo_camera_color_44in48dp.png
 create mode 100644 res_p/mipmap-xxxhdpi/logo_camera_color_44in48dp.png

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/drawable-hdpi/logo_camera_color_44in48dp.png
deleted file mode 100644
index 1ac6b5840..000000000
Binary files a/res_p/drawable-hdpi/logo_camera_color_44in48dp.png and /dev/null differ
diff --git a/res_p/drawable-mdpi/logo_camera_color_44in48dp.png b/res_p/drawable-mdpi/logo_camera_color_44in48dp.png
deleted file mode 100644
index 3868f159c..000000000
Binary files a/res_p/drawable-mdpi/logo_camera_color_44in48dp.png and /dev/null differ
diff --git a/res_p/drawable-xhdpi/logo_camera_color_44in48dp.png b/res_p/drawable-xhdpi/logo_camera_color_44in48dp.png
deleted file mode 100644
index 7593dc3f8..000000000
Binary files a/res_p/drawable-xhdpi/logo_camera_color_44in48dp.png and /dev/null differ
diff --git a/res_p/drawable-xxhdpi/logo_camera_color_44in48dp.png b/res_p/drawable-xxhdpi/logo_camera_color_44in48dp.png
deleted file mode 100644
index a989efe02..000000000
Binary files a/res_p/drawable-xxhdpi/logo_camera_color_44in48dp.png and /dev/null differ
diff --git a/res_p/drawable-xxxhdpi/logo_camera_color_44in48dp.png b/res_p/drawable-xxxhdpi/logo_camera_color_44in48dp.png
deleted file mode 100644
index 9264c3417..000000000
Binary files a/res_p/drawable-xxxhdpi/logo_camera_color_44in48dp.png and /dev/null differ
diff --git a/res_p/mipmap-hdpi/logo_camera_color_44in48dp.png b/res_p/mipmap-hdpi/logo_camera_color_44in48dp.png
new file mode 100644
index 000000000..1ac6b5840
Binary files /dev/null and b/res_p/mipmap-hdpi/logo_camera_color_44in48dp.png differ
diff --git a/res_p/mipmap-mdpi/logo_camera_color_44in48dp.png b/res_p/mipmap-mdpi/logo_camera_color_44in48dp.png
new file mode 100644
index 000000000..3868f159c
Binary files /dev/null and b/res_p/mipmap-mdpi/logo_camera_color_44in48dp.png differ
diff --git a/res_p/mipmap-xhdpi/logo_camera_color_44in48dp.png b/res_p/mipmap-xhdpi/logo_camera_color_44in48dp.png
new file mode 100644
index 000000000..7593dc3f8
Binary files /dev/null and b/res_p/mipmap-xhdpi/logo_camera_color_44in48dp.png differ
diff --git a/res_p/mipmap-xxhdpi/logo_camera_color_44in48dp.png b/res_p/mipmap-xxhdpi/logo_camera_color_44in48dp.png
new file mode 100644
index 000000000..a989efe02
Binary files /dev/null and b/res_p/mipmap-xxhdpi/logo_camera_color_44in48dp.png differ
diff --git a/res_p/mipmap-xxxhdpi/logo_camera_color_44in48dp.png b/res_p/mipmap-xxxhdpi/logo_camera_color_44in48dp.png
new file mode 100644
index 000000000..9264c3417
Binary files /dev/null and b/res_p/mipmap-xxxhdpi/logo_camera_color_44in48dp.png differ
-- 
cgit v1.2.3