Camera2: adaptive icon

Change-Id: I020c5ee64ff12eb55af6fa950d6439e0c91d563f

17 files changed, 6 insertions, 5 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1f13e3e80..0eddac76d 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"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:largeHeap="true"
         android:resizeableActivity="false"
diff --git a/res_p/mipmap-anydpi/logo_camera_color.xml b/res_p/mipmap-anydpi/ic_launcher.xml
index f9cf2730e..d8649ba56 100644
--- a/res_p/mipmap-anydpi/logo_camera_color.xml
+++ b/res_p/mipmap-anydpi/ic_launcher.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
+<!-- Copyright (c) 2018 The LineageOS 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
+         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,
@@ -14,6 +14,7 @@
      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"/>
+    <background android:drawable="@mipmap/ic_background"/>
+    <foreground android:drawable="@mipmap/ic_foreground"/>
 </adaptive-icon>
+
diff --git a/res_p/mipmap-hdpi/ic_background.png b/res_p/mipmap-hdpi/ic_background.png
new file mode 100644
index 000000000..591eeb3af
--- /dev/null
+++ b/res_p/mipmap-hdpi/ic_background.png
diff --git a/res_p/mipmap-hdpi/ic_foreground.png b/res_p/mipmap-hdpi/ic_foreground.png
new file mode 100644
index 000000000..6f16c1969
--- /dev/null
+++ b/res_p/mipmap-hdpi/ic_foreground.png
diff --git a/res_p/mipmap-hdpi/logo_camera_color_foreground.png b/res_p/mipmap-hdpi/logo_camera_color_foreground.png
deleted file mode 100644
index c1724198f..000000000
--- a/res_p/mipmap-hdpi/logo_camera_color_foreground.png
+++ /dev/null
diff --git a/res_p/mipmap-mdpi/ic_background.png b/res_p/mipmap-mdpi/ic_background.png
new file mode 100644
index 000000000..1eb04d24b
--- /dev/null
+++ b/res_p/mipmap-mdpi/ic_background.png
diff --git a/res_p/mipmap-mdpi/ic_foreground.png b/res_p/mipmap-mdpi/ic_foreground.png
new file mode 100644
index 000000000..b08ab8774
--- /dev/null
+++ b/res_p/mipmap-mdpi/ic_foreground.png
diff --git a/res_p/mipmap-mdpi/logo_camera_color_foreground.png b/res_p/mipmap-mdpi/logo_camera_color_foreground.png
deleted file mode 100644
index aaad2a94d..000000000
--- a/res_p/mipmap-mdpi/logo_camera_color_foreground.png
+++ /dev/null
diff --git a/res_p/mipmap-xhdpi/ic_background.png b/res_p/mipmap-xhdpi/ic_background.png
new file mode 100644
index 000000000..daeceb3af
--- /dev/null
+++ b/res_p/mipmap-xhdpi/ic_background.png
diff --git a/res_p/mipmap-xhdpi/ic_foreground.png b/res_p/mipmap-xhdpi/ic_foreground.png
new file mode 100644
index 000000000..ede38061f
--- /dev/null
+++ b/res_p/mipmap-xhdpi/ic_foreground.png
diff --git a/res_p/mipmap-xhdpi/logo_camera_color_foreground.png b/res_p/mipmap-xhdpi/logo_camera_color_foreground.png
deleted file mode 100644
index 8046dbf52..000000000
--- a/res_p/mipmap-xhdpi/logo_camera_color_foreground.png
+++ /dev/null
diff --git a/res_p/mipmap-xxhdpi/ic_background.png b/res_p/mipmap-xxhdpi/ic_background.png
new file mode 100644
index 000000000..28b55617e
--- /dev/null
+++ b/res_p/mipmap-xxhdpi/ic_background.png
diff --git a/res_p/mipmap-xxhdpi/ic_foreground.png b/res_p/mipmap-xxhdpi/ic_foreground.png
new file mode 100644
index 000000000..efd6ec767
--- /dev/null
+++ b/res_p/mipmap-xxhdpi/ic_foreground.png
diff --git a/res_p/mipmap-xxhdpi/logo_camera_color_foreground.png b/res_p/mipmap-xxhdpi/logo_camera_color_foreground.png
deleted file mode 100644
index d517b970f..000000000
--- a/res_p/mipmap-xxhdpi/logo_camera_color_foreground.png
+++ /dev/null
diff --git a/res_p/mipmap-xxxhdpi/ic_background.png b/res_p/mipmap-xxxhdpi/ic_background.png
new file mode 100644
index 000000000..31fbb3609
--- /dev/null
+++ b/res_p/mipmap-xxxhdpi/ic_background.png
diff --git a/res_p/mipmap-xxxhdpi/ic_foreground.png b/res_p/mipmap-xxxhdpi/ic_foreground.png
new file mode 100644
index 000000000..a1425830f
--- /dev/null
+++ b/res_p/mipmap-xxxhdpi/ic_foreground.png
diff --git a/res_p/mipmap-xxxhdpi/logo_camera_color_foreground.png b/res_p/mipmap-xxxhdpi/logo_camera_color_foreground.png
deleted file mode 100644
index fad721f22..000000000
--- a/res_p/mipmap-xxxhdpi/logo_camera_color_foreground.png
+++ /dev/null