From: Alan Newberger <alann@google.com>
Date: Wed, 13 Aug 2014 17:14:30 +0000 (+0000)
Subject: am a804e2d2: Merge "New Material icons for Camera2" into ub-camera-glacier
X-Git-Tag: android-x86-6.0-r3~68^2~28^2~178
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e497c2754bd36e181babf96b4125bd536a5272e5;hp=280ba48b64d92d8b8e9308d50287148732cc35d0;p=android-x86%2Fpackages-apps-Camera2.git

am a804e2d2: Merge "New Material icons for Camera2" into ub-camera-glacier

* commit 'a804e2d29800fd66f6db552c9cb55117888be44b':
  New Material icons for Camera2
---

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 284b361dc..b38c70025 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -42,10 +42,9 @@
     <application
         android:name="com.android.camera.app.CameraApp"
         android:hardwareAccelerated="true"
-        android:icon="@mipmap/ic_launcher_camera"
+        android:icon="@drawable/ic_camera_clr_48dp"
         android:label="@string/app_name"
         android:largeHeap="true"
-        android:logo="@mipmap/ic_launcher_camera"
         android:restoreAnyVersion="true"
         android:supportsRtl="true"
         android:theme="@style/Theme.Camera" >
@@ -53,9 +52,7 @@
             android:name="com.android.camera.CameraActivity"
             android:clearTaskOnLaunch="true"
             android:configChanges="orientation|screenSize|keyboardHidden"
-            android:icon="@mipmap/ic_launcher_camera"
             android:label="@string/app_name"
-            android:logo="@mipmap/ic_launcher_camera"
             android:taskAffinity="com.android.camera.CameraActivity"
             android:theme="@style/Theme.Camera"
             android:windowSoftInputMode="stateAlwaysHidden|adjustPan" >
@@ -79,7 +76,6 @@
 
         <activity-alias
             android:name="com.android.camera.CameraLauncher"
-            android:icon="@mipmap/ic_launcher_camera"
             android:label="@string/app_name"
             android:targetActivity="com.android.camera.CameraActivity">
             <intent-filter>
@@ -93,7 +89,6 @@
         <!-- Video camera and capture use the Camcorder label and icon. -->
         <activity-alias
             android:name="com.android.camera.VideoCamera"
-            android:icon="@mipmap/ic_launcher_video_camera"
             android:label="@string/video_camera_label"
             android:targetActivity="com.android.camera.CameraActivity">
             <intent-filter>
@@ -111,9 +106,7 @@
             android:clearTaskOnLaunch="true"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:excludeFromRecents="true"
-            android:icon="@mipmap/ic_launcher_camera"
             android:label="@string/app_name"
-            android:logo="@mipmap/ic_launcher_camera"
             android:taskAffinity="com.android.camera.SecureCameraActivity"
             android:theme="@style/Theme.Camera"
             android:windowSoftInputMode="stateAlwaysHidden|adjustPan" >
diff --git a/res_p/drawable-hdpi/ic_camera_clr_48dp.png b/res_p/drawable-hdpi/ic_camera_clr_48dp.png
new file mode 100644
index 000000000..008a75262
Binary files /dev/null and b/res_p/drawable-hdpi/ic_camera_clr_48dp.png differ
diff --git a/res_p/drawable-mdpi/ic_camera_clr_48dp.png b/res_p/drawable-mdpi/ic_camera_clr_48dp.png
new file mode 100644
index 000000000..ed974c90a
Binary files /dev/null and b/res_p/drawable-mdpi/ic_camera_clr_48dp.png differ
diff --git a/res_p/drawable-xhdpi/ic_camera_clr_48dp.png b/res_p/drawable-xhdpi/ic_camera_clr_48dp.png
new file mode 100644
index 000000000..4e73cb680
Binary files /dev/null and b/res_p/drawable-xhdpi/ic_camera_clr_48dp.png differ
diff --git a/res_p/drawable-xxhdpi/ic_camera_clr_48dp.png b/res_p/drawable-xxhdpi/ic_camera_clr_48dp.png
new file mode 100644
index 000000000..347945355
Binary files /dev/null and b/res_p/drawable-xxhdpi/ic_camera_clr_48dp.png differ
diff --git a/res_p/drawable-xxxhdpi/ic_camera_clr_48dp.png b/res_p/drawable-xxxhdpi/ic_camera_clr_48dp.png
new file mode 100644
index 000000000..e3a18c22e
Binary files /dev/null and b/res_p/drawable-xxxhdpi/ic_camera_clr_48dp.png differ
diff --git a/res_p/mipmap-hdpi/ic_launcher_camera.png b/res_p/mipmap-hdpi/ic_launcher_camera.png
deleted file mode 100644
index c1ebe77e6..000000000
Binary files a/res_p/mipmap-hdpi/ic_launcher_camera.png and /dev/null differ
diff --git a/res_p/mipmap-hdpi/ic_launcher_video_camera.png b/res_p/mipmap-hdpi/ic_launcher_video_camera.png
deleted file mode 100644
index d24265729..000000000
Binary files a/res_p/mipmap-hdpi/ic_launcher_video_camera.png and /dev/null differ
diff --git a/res_p/mipmap-mdpi/ic_launcher_camera.png b/res_p/mipmap-mdpi/ic_launcher_camera.png
deleted file mode 100644
index 20f1499ea..000000000
Binary files a/res_p/mipmap-mdpi/ic_launcher_camera.png and /dev/null differ
diff --git a/res_p/mipmap-mdpi/ic_launcher_video_camera.png b/res_p/mipmap-mdpi/ic_launcher_video_camera.png
deleted file mode 100644
index 19f0e64e2..000000000
Binary files a/res_p/mipmap-mdpi/ic_launcher_video_camera.png and /dev/null differ
diff --git a/res_p/mipmap-xhdpi/ic_launcher_camera.png b/res_p/mipmap-xhdpi/ic_launcher_camera.png
deleted file mode 100644
index 972ee40d9..000000000
Binary files a/res_p/mipmap-xhdpi/ic_launcher_camera.png and /dev/null differ
diff --git a/res_p/mipmap-xxhdpi/ic_launcher_camera.png b/res_p/mipmap-xxhdpi/ic_launcher_camera.png
deleted file mode 100644
index 4cc58ee1d..000000000
Binary files a/res_p/mipmap-xxhdpi/ic_launcher_camera.png and /dev/null differ