summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorHyunyoung Song <hyunyoungs@google.com>2017-03-03 21:16:37 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-03-03 21:16:37 +0000
commit61d351fe82f26acd6afd580b71ee9c535ab66c54 (patch)
tree0847a69a5ffd11b0fb2631a0f9c4c00a101585b2 /res
parent74480b7bca8451eaea64236cb4b4c8e31def6b9b (diff)
parent837eb1f47d868e22358ba7c12a4771882965be27 (diff)
downloadandroid_packages_apps_Trebuchet-61d351fe82f26acd6afd580b71ee9c535ab66c54.tar.gz
android_packages_apps_Trebuchet-61d351fe82f26acd6afd580b71ee9c535ab66c54.tar.bz2
android_packages_apps_Trebuchet-61d351fe82f26acd6afd580b71ee9c535ab66c54.zip
Merge "Change application launcher icons to adaptive icons b/35429795" into ub-launcher3-dorval
Diffstat (limited to 'res')
-rw-r--r--res/drawable-v26/adaptive_icon_drawable_wrapper.xml (renamed from res/drawable-v26/mask_drawable_wrapper.xml)4
-rw-r--r--res/drawable-v26/ic_launcher_home.xml21
-rw-r--r--res/drawable/ic_launcher_home.xml18
-rw-r--r--res/mipmap-hdpi/ic_launcher_home_foreground.pngbin0 -> 236 bytes
-rw-r--r--res/mipmap-mdpi/ic_launcher_home_foreground.pngbin0 -> 339 bytes
-rw-r--r--res/mipmap-xhdpi/ic_launcher_home_foreground.pngbin0 -> 357 bytes
-rw-r--r--res/mipmap-xxhdpi/ic_launcher_home_foreground.pngbin0 -> 485 bytes
-rw-r--r--res/values/colors.xml1
8 files changed, 42 insertions, 2 deletions
diff --git a/res/drawable-v26/mask_drawable_wrapper.xml b/res/drawable-v26/adaptive_icon_drawable_wrapper.xml
index 36efd0f95..7ad8e2c64 100644
--- a/res/drawable-v26/mask_drawable_wrapper.xml
+++ b/res/drawable-v26/adaptive_icon_drawable_wrapper.xml
@@ -14,9 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<maskable-icon xmlns:android="http://schemas.android.com/apk/res/android">
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:color="#FFE0E0E0"/>
<foreground>
<com.android.launcher3.graphics.FixedScaleDrawable />
</foreground>
-</maskable-icon>
+</adaptive-icon>
diff --git a/res/drawable-v26/ic_launcher_home.xml b/res/drawable-v26/ic_launcher_home.xml
new file mode 100644
index 000000000..7038775f3
--- /dev/null
+++ b/res/drawable-v26/ic_launcher_home.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 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/icon_background" />
+ <foreground>
+ <bitmap android:src="@mipmap/ic_launcher_home_foreground"/>
+ </foreground>
+</adaptive-icon>
diff --git a/res/drawable/ic_launcher_home.xml b/res/drawable/ic_launcher_home.xml
new file mode 100644
index 000000000..a6f251995
--- /dev/null
+++ b/res/drawable/ic_launcher_home.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 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.
+-->
+<bitmap
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@mipmap/ic_launcher_home" />
diff --git a/res/mipmap-hdpi/ic_launcher_home_foreground.png b/res/mipmap-hdpi/ic_launcher_home_foreground.png
new file mode 100644
index 000000000..d068d9236
--- /dev/null
+++ b/res/mipmap-hdpi/ic_launcher_home_foreground.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_home_foreground.png b/res/mipmap-mdpi/ic_launcher_home_foreground.png
new file mode 100644
index 000000000..0ed9f4d81
--- /dev/null
+++ b/res/mipmap-mdpi/ic_launcher_home_foreground.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_home_foreground.png b/res/mipmap-xhdpi/ic_launcher_home_foreground.png
new file mode 100644
index 000000000..7a9daf5bf
--- /dev/null
+++ b/res/mipmap-xhdpi/ic_launcher_home_foreground.png
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_home_foreground.png b/res/mipmap-xxhdpi/ic_launcher_home_foreground.png
new file mode 100644
index 000000000..03b493e4a
--- /dev/null
+++ b/res/mipmap-xxhdpi/ic_launcher_home_foreground.png
Binary files differ
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 68f009295..83a44d7b9 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -40,4 +40,5 @@
<color name="notification_background_color">#FFF</color>
<color name="notification_color_beneath">#E0E0E0</color> <!-- Gray 300 -->
<color name="divider_color">@color/notification_color_beneath</color>
+ <color name="icon_background">#E0E0E0</color> <!-- Gray 300 -->
</resources>