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 284b361..b38c700 100644 (file)
--- 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 (file)
index 0000000..008a752
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 (file)
index 0000000..ed974c9
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 (file)
index 0000000..4e73cb6
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 (file)
index 0000000..3479453
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 (file)
index 0000000..e3a18c2
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 (file)
index c1ebe77..0000000
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 (file)
index d242657..0000000
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 (file)
index 20f1499..0000000
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 (file)
index 19f0e64..0000000
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 (file)
index 972ee40..0000000
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 (file)
index 4cc58ee..0000000
Binary files a/res_p/mipmap-xxhdpi/ic_launcher_camera.png and /dev/null differ