Adaptive icon for Camera2 AOSP

Bug: 64332797
Test: manual

Change-Id: I91ddd5db21f4164ef52d2de94230c0298cc7394c

13 files changed, 21 insertions, 1 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ddb89204f..5fb8838d8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -39,7 +39,7 @@
     <application
         android:name="com.android.camera.app.CameraApp"
         android:hardwareAccelerated="true"
-        android:icon="@mipmap/logo_camera_color_44in48dp"
+        android:icon="@mipmap/logo_camera_color"
         android:label="@string/app_name"
         android:largeHeap="true"
         android:resizeableActivity="false"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index b9735d960..3f0ea51a5 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -77,4 +77,5 @@
     <color name="mode_icon_hover_highlight">#2DFFFFFF</color>
 
     <color name="blue_button_text_color">#00838F</color>
+    <color name="ic_launcher_background">#4285f4</color>
 </resources>
diff --git a/res_p/mipmap-anydpi/logo_camera_color.xml b/res_p/mipmap-anydpi/logo_camera_color.xml
new file mode 100644
index 000000000..f9cf2730e
--- /dev/null
+++ b/res_p/mipmap-anydpi/logo_camera_color.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/logo_camera_color_foreground"/>
+</adaptive-icon>
diff --git a/res_p/mipmap-hdpi/logo_camera_color_44in48dp.png b/res_p/mipmap-hdpi/logo_camera_color_44in48dp.png
deleted file mode 100644
index 1ac6b5840..000000000
--- a/res_p/mipmap-hdpi/logo_camera_color_44in48dp.png
+++ /dev/null
diff --git a/res_p/mipmap-hdpi/logo_camera_color_foreground.png b/res_p/mipmap-hdpi/logo_camera_color_foreground.png
new file mode 100644
index 000000000..c1724198f
--- /dev/null
+++ b/res_p/mipmap-hdpi/logo_camera_color_foreground.png
diff --git a/res_p/mipmap-mdpi/logo_camera_color_44in48dp.png b/res_p/mipmap-mdpi/logo_camera_color_44in48dp.png
deleted file mode 100644
index 3868f159c..000000000
--- a/res_p/mipmap-mdpi/logo_camera_color_44in48dp.png
+++ /dev/null
diff --git a/res_p/mipmap-mdpi/logo_camera_color_foreground.png b/res_p/mipmap-mdpi/logo_camera_color_foreground.png
new file mode 100644
index 000000000..aaad2a94d
--- /dev/null
+++ b/res_p/mipmap-mdpi/logo_camera_color_foreground.png
diff --git a/res_p/mipmap-xhdpi/logo_camera_color_44in48dp.png b/res_p/mipmap-xhdpi/logo_camera_color_44in48dp.png
deleted file mode 100644
index 7593dc3f8..000000000
--- a/res_p/mipmap-xhdpi/logo_camera_color_44in48dp.png
+++ /dev/null
diff --git a/res_p/mipmap-xhdpi/logo_camera_color_foreground.png b/res_p/mipmap-xhdpi/logo_camera_color_foreground.png
new file mode 100644
index 000000000..8046dbf52
--- /dev/null
+++ b/res_p/mipmap-xhdpi/logo_camera_color_foreground.png
diff --git a/res_p/mipmap-xxhdpi/logo_camera_color_44in48dp.png b/res_p/mipmap-xxhdpi/logo_camera_color_44in48dp.png
deleted file mode 100644
index a989efe02..000000000
--- a/res_p/mipmap-xxhdpi/logo_camera_color_44in48dp.png
+++ /dev/null
diff --git a/res_p/mipmap-xxhdpi/logo_camera_color_foreground.png b/res_p/mipmap-xxhdpi/logo_camera_color_foreground.png
new file mode 100644
index 000000000..d517b970f
--- /dev/null
+++ b/res_p/mipmap-xxhdpi/logo_camera_color_foreground.png
diff --git a/res_p/mipmap-xxxhdpi/logo_camera_color_44in48dp.png b/res_p/mipmap-xxxhdpi/logo_camera_color_44in48dp.png
deleted file mode 100644
index 9264c3417..000000000
--- a/res_p/mipmap-xxxhdpi/logo_camera_color_44in48dp.png
+++ /dev/null
diff --git a/res_p/mipmap-xxxhdpi/logo_camera_color_foreground.png b/res_p/mipmap-xxxhdpi/logo_camera_color_foreground.png
new file mode 100644
index 000000000..fad721f22
--- /dev/null
+++ b/res_p/mipmap-xxxhdpi/logo_camera_color_foreground.png