summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryaolu <yaolu@google.com>2017-07-21 15:38:12 -0700
committeryaolu <yaolu@google.com>2017-07-25 14:42:17 -0700
commited2e4d834e0ad8c8db04fdf69394168724335bc7 (patch)
treed6afb1dc0e550d383b8381042ba230809b473e12
parent6148c31a0a666604a8a2a6e638dee3bda1554148 (diff)
downloadpackages_apps_Contacts-ed2e4d834e0ad8c8db04fdf69394168724335bc7.tar.gz
packages_apps_Contacts-ed2e4d834e0ad8c8db04fdf69394168724335bc7.tar.bz2
packages_apps_Contacts-ed2e4d834e0ad8c8db04fdf69394168724335bc7.zip
Change AOSP Contacts icon and remove Google logo from launch screen
* replaced all icons in Contacts/res/... * replaced all icon assets for launch screen in Contacts/res/... * removed all Google logo assets and dimens for launch screen in Contacts/res/... I will add the removed stuff for icon, adaptive icon, launch screen back in k-dev, so that GoogleContacts remains the same. Bug: 63887147 Test: mmma -j20 packages/apps/Contacts Manually tested on Nexus5x N, Pixel O, Nexus9 L https://screenshot.googleplex.com/mGMJs48OC4J Change-Id: Idf9f31851d8000c777ee67ceab4bbf93c40cd373
-rw-r--r--res/drawable-hdpi/googlelogo_dark20_color_132x44.pngbin1714 -> 0 bytes
-rw-r--r--res/drawable-hdpi/googlelogo_dark20_color_184x60.pngbin2155 -> 0 bytes
-rw-r--r--res/drawable-hdpi/product_logo_contacts_color_144.pngbin12887 -> 9396 bytes
-rw-r--r--res/drawable-hdpi/product_logo_contacts_color_192.pngbin18330 -> 13102 bytes
-rw-r--r--res/drawable-mdpi/googlelogo_dark20_color_132x44.pngbin1002 -> 0 bytes
-rw-r--r--res/drawable-mdpi/googlelogo_dark20_color_184x60.pngbin1345 -> 0 bytes
-rw-r--r--res/drawable-mdpi/product_logo_contacts_color_144.pngbin7963 -> 5858 bytes
-rw-r--r--res/drawable-mdpi/product_logo_contacts_color_192.pngbin11363 -> 8082 bytes
-rwxr-xr-xres/drawable-sw600dp/quantum_launchscreen_contacts.xml7
-rw-r--r--res/drawable-xhdpi/googlelogo_dark20_color_132x44.pngbin2151 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/googlelogo_dark20_color_184x60.pngbin2706 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/product_logo_contacts_color_144.pngbin18330 -> 13102 bytes
-rw-r--r--res/drawable-xhdpi/product_logo_contacts_color_192.pngbin26284 -> 18943 bytes
-rw-r--r--res/drawable-xxhdpi/googlelogo_dark20_color_132x44.pngbin2954 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/googlelogo_dark20_color_184x60.pngbin4215 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/product_logo_contacts_color_144.pngbin29839 -> 21596 bytes
-rw-r--r--res/drawable-xxhdpi/product_logo_contacts_color_192.pngbin42620 -> 31375 bytes
-rw-r--r--res/drawable-xxxhdpi/googlelogo_dark20_color_132x44.pngbin4201 -> 0 bytes
-rw-r--r--res/drawable-xxxhdpi/googlelogo_dark20_color_184x60.pngbin5942 -> 0 bytes
-rw-r--r--res/drawable-xxxhdpi/product_logo_contacts_color_144.pngbin42620 -> 31375 bytes
-rw-r--r--res/drawable-xxxhdpi/product_logo_contacts_color_192.pngbin59752 -> 44161 bytes
-rwxr-xr-xres/drawable/quantum_launchscreen_contacts.xml7
-rw-r--r--res/mipmap-anydpi-v26/ic_contacts_launcher.xml19
-rw-r--r--res/mipmap-hdpi/ic_contacts_launcher.pngbin3904 -> 3169 bytes
-rw-r--r--res/mipmap-hdpi/ic_contacts_launcher_foreground.pngbin9120 -> 0 bytes
-rw-r--r--res/mipmap-mdpi/ic_contacts_launcher.pngbin2317 -> 2062 bytes
-rw-r--r--res/mipmap-mdpi/ic_contacts_launcher_foreground.pngbin5391 -> 0 bytes
-rw-r--r--res/mipmap-xhdpi/ic_contacts_launcher.pngbin5547 -> 4430 bytes
-rw-r--r--res/mipmap-xhdpi/ic_contacts_launcher_foreground.pngbin13037 -> 0 bytes
-rw-r--r--res/mipmap-xxhdpi/ic_contacts_launcher.pngbin9316 -> 7228 bytes
-rw-r--r--res/mipmap-xxhdpi/ic_contacts_launcher_foreground.pngbin21701 -> 0 bytes
-rw-r--r--res/mipmap-xxxhdpi/ic_contacts_launcher.pngbin13284 -> 10065 bytes
-rw-r--r--res/mipmap-xxxhdpi/ic_contacts_launcher_foreground.pngbin31101 -> 0 bytes
-rw-r--r--res/values-sw600dp-land/dimens.xml1
-rw-r--r--res/values-sw600dp/dimens.xml1
-rw-r--r--res/values/colors.xml2
-rw-r--r--res/values/dimens.xml1
37 files changed, 0 insertions, 38 deletions
diff --git a/res/drawable-hdpi/googlelogo_dark20_color_132x44.png b/res/drawable-hdpi/googlelogo_dark20_color_132x44.png
deleted file mode 100644
index 078c8a84c..000000000
--- a/res/drawable-hdpi/googlelogo_dark20_color_132x44.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/googlelogo_dark20_color_184x60.png b/res/drawable-hdpi/googlelogo_dark20_color_184x60.png
deleted file mode 100644
index 9d25e3dc6..000000000
--- a/res/drawable-hdpi/googlelogo_dark20_color_184x60.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/product_logo_contacts_color_144.png b/res/drawable-hdpi/product_logo_contacts_color_144.png
index d26a36381..293a85ee1 100644
--- a/res/drawable-hdpi/product_logo_contacts_color_144.png
+++ b/res/drawable-hdpi/product_logo_contacts_color_144.png
Binary files differ
diff --git a/res/drawable-hdpi/product_logo_contacts_color_192.png b/res/drawable-hdpi/product_logo_contacts_color_192.png
index ebd8a8ba1..04a5a1022 100644
--- a/res/drawable-hdpi/product_logo_contacts_color_192.png
+++ b/res/drawable-hdpi/product_logo_contacts_color_192.png
Binary files differ
diff --git a/res/drawable-mdpi/googlelogo_dark20_color_132x44.png b/res/drawable-mdpi/googlelogo_dark20_color_132x44.png
deleted file mode 100644
index a045daba6..000000000
--- a/res/drawable-mdpi/googlelogo_dark20_color_132x44.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/googlelogo_dark20_color_184x60.png b/res/drawable-mdpi/googlelogo_dark20_color_184x60.png
deleted file mode 100644
index d1181a995..000000000
--- a/res/drawable-mdpi/googlelogo_dark20_color_184x60.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/product_logo_contacts_color_144.png b/res/drawable-mdpi/product_logo_contacts_color_144.png
index e28097c2b..27c571ec7 100644
--- a/res/drawable-mdpi/product_logo_contacts_color_144.png
+++ b/res/drawable-mdpi/product_logo_contacts_color_144.png
Binary files differ
diff --git a/res/drawable-mdpi/product_logo_contacts_color_192.png b/res/drawable-mdpi/product_logo_contacts_color_192.png
index a8fcbf050..6e794122d 100644
--- a/res/drawable-mdpi/product_logo_contacts_color_192.png
+++ b/res/drawable-mdpi/product_logo_contacts_color_192.png
Binary files differ
diff --git a/res/drawable-sw600dp/quantum_launchscreen_contacts.xml b/res/drawable-sw600dp/quantum_launchscreen_contacts.xml
index 5cc35d55d..0272a01c3 100755
--- a/res/drawable-sw600dp/quantum_launchscreen_contacts.xml
+++ b/res/drawable-sw600dp/quantum_launchscreen_contacts.xml
@@ -24,11 +24,4 @@
android:gravity="center"
android:src="@drawable/product_logo_contacts_color_192" />
</item>
- <item
- android:id="@+id/launchscreens_logo_text"
- android:bottom="@dimen/launchscreens_google_logo_bottom">
- <bitmap
- android:gravity="center_horizontal|bottom"
- android:src="@drawable/googlelogo_dark20_color_184x60" />
- </item>
</layer-list>
diff --git a/res/drawable-xhdpi/googlelogo_dark20_color_132x44.png b/res/drawable-xhdpi/googlelogo_dark20_color_132x44.png
deleted file mode 100644
index 437f083a0..000000000
--- a/res/drawable-xhdpi/googlelogo_dark20_color_132x44.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/googlelogo_dark20_color_184x60.png b/res/drawable-xhdpi/googlelogo_dark20_color_184x60.png
deleted file mode 100644
index 2bd813fc0..000000000
--- a/res/drawable-xhdpi/googlelogo_dark20_color_184x60.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/product_logo_contacts_color_144.png b/res/drawable-xhdpi/product_logo_contacts_color_144.png
index ebd8a8ba1..04a5a1022 100644
--- a/res/drawable-xhdpi/product_logo_contacts_color_144.png
+++ b/res/drawable-xhdpi/product_logo_contacts_color_144.png
Binary files differ
diff --git a/res/drawable-xhdpi/product_logo_contacts_color_192.png b/res/drawable-xhdpi/product_logo_contacts_color_192.png
index 690bbd027..35d80e44c 100644
--- a/res/drawable-xhdpi/product_logo_contacts_color_192.png
+++ b/res/drawable-xhdpi/product_logo_contacts_color_192.png
Binary files differ
diff --git a/res/drawable-xxhdpi/googlelogo_dark20_color_132x44.png b/res/drawable-xxhdpi/googlelogo_dark20_color_132x44.png
deleted file mode 100644
index b22fba6f1..000000000
--- a/res/drawable-xxhdpi/googlelogo_dark20_color_132x44.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/googlelogo_dark20_color_184x60.png b/res/drawable-xxhdpi/googlelogo_dark20_color_184x60.png
deleted file mode 100644
index 6e4193e6d..000000000
--- a/res/drawable-xxhdpi/googlelogo_dark20_color_184x60.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/product_logo_contacts_color_144.png b/res/drawable-xxhdpi/product_logo_contacts_color_144.png
index 8ff6a1478..12c582b4a 100644
--- a/res/drawable-xxhdpi/product_logo_contacts_color_144.png
+++ b/res/drawable-xxhdpi/product_logo_contacts_color_144.png
Binary files differ
diff --git a/res/drawable-xxhdpi/product_logo_contacts_color_192.png b/res/drawable-xxhdpi/product_logo_contacts_color_192.png
index c32d9cd2a..baa000370 100644
--- a/res/drawable-xxhdpi/product_logo_contacts_color_192.png
+++ b/res/drawable-xxhdpi/product_logo_contacts_color_192.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/googlelogo_dark20_color_132x44.png b/res/drawable-xxxhdpi/googlelogo_dark20_color_132x44.png
deleted file mode 100644
index 7372b472f..000000000
--- a/res/drawable-xxxhdpi/googlelogo_dark20_color_132x44.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/googlelogo_dark20_color_184x60.png b/res/drawable-xxxhdpi/googlelogo_dark20_color_184x60.png
deleted file mode 100644
index 60de38b4c..000000000
--- a/res/drawable-xxxhdpi/googlelogo_dark20_color_184x60.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/product_logo_contacts_color_144.png b/res/drawable-xxxhdpi/product_logo_contacts_color_144.png
index c32d9cd2a..baa000370 100644
--- a/res/drawable-xxxhdpi/product_logo_contacts_color_144.png
+++ b/res/drawable-xxxhdpi/product_logo_contacts_color_144.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/product_logo_contacts_color_192.png b/res/drawable-xxxhdpi/product_logo_contacts_color_192.png
index 1346cbccf..f1a62e660 100644
--- a/res/drawable-xxxhdpi/product_logo_contacts_color_192.png
+++ b/res/drawable-xxxhdpi/product_logo_contacts_color_192.png
Binary files differ
diff --git a/res/drawable/quantum_launchscreen_contacts.xml b/res/drawable/quantum_launchscreen_contacts.xml
index 199589962..276b2da33 100755
--- a/res/drawable/quantum_launchscreen_contacts.xml
+++ b/res/drawable/quantum_launchscreen_contacts.xml
@@ -24,11 +24,4 @@
android:gravity="center"
android:src="@drawable/product_logo_contacts_color_144" />
</item>
- <item
- android:id="@+id/launchscreens_logo_text"
- android:bottom="@dimen/launchscreens_google_logo_bottom">
- <bitmap
- android:gravity="center_horizontal|bottom"
- android:src="@drawable/googlelogo_dark20_color_132x44" />
- </item>
</layer-list>
diff --git a/res/mipmap-anydpi-v26/ic_contacts_launcher.xml b/res/mipmap-anydpi-v26/ic_contacts_launcher.xml
deleted file mode 100644
index 784f6e334..000000000
--- a/res/mipmap-anydpi-v26/ic_contacts_launcher.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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/ic_contacts_launcher_background"/>
- <foreground android:drawable="@mipmap/ic_contacts_launcher_foreground"/>
-</adaptive-icon> \ No newline at end of file
diff --git a/res/mipmap-hdpi/ic_contacts_launcher.png b/res/mipmap-hdpi/ic_contacts_launcher.png
index 0fd1492ba..64eff002f 100644
--- a/res/mipmap-hdpi/ic_contacts_launcher.png
+++ b/res/mipmap-hdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/res/mipmap-hdpi/ic_contacts_launcher_foreground.png b/res/mipmap-hdpi/ic_contacts_launcher_foreground.png
deleted file mode 100644
index 8088777d2..000000000
--- a/res/mipmap-hdpi/ic_contacts_launcher_foreground.png
+++ /dev/null
Binary files differ
diff --git a/res/mipmap-mdpi/ic_contacts_launcher.png b/res/mipmap-mdpi/ic_contacts_launcher.png
index e23930b82..b4ee8215a 100644
--- a/res/mipmap-mdpi/ic_contacts_launcher.png
+++ b/res/mipmap-mdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_contacts_launcher_foreground.png b/res/mipmap-mdpi/ic_contacts_launcher_foreground.png
deleted file mode 100644
index abea159d6..000000000
--- a/res/mipmap-mdpi/ic_contacts_launcher_foreground.png
+++ /dev/null
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_contacts_launcher.png b/res/mipmap-xhdpi/ic_contacts_launcher.png
index aff0f3166..6feeadfbe 100644
--- a/res/mipmap-xhdpi/ic_contacts_launcher.png
+++ b/res/mipmap-xhdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_contacts_launcher_foreground.png b/res/mipmap-xhdpi/ic_contacts_launcher_foreground.png
deleted file mode 100644
index 1fb675218..000000000
--- a/res/mipmap-xhdpi/ic_contacts_launcher_foreground.png
+++ /dev/null
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_contacts_launcher.png b/res/mipmap-xxhdpi/ic_contacts_launcher.png
index 9cd2ebe42..01a3fde9d 100644
--- a/res/mipmap-xxhdpi/ic_contacts_launcher.png
+++ b/res/mipmap-xxhdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_contacts_launcher_foreground.png b/res/mipmap-xxhdpi/ic_contacts_launcher_foreground.png
deleted file mode 100644
index f1be7b134..000000000
--- a/res/mipmap-xxhdpi/ic_contacts_launcher_foreground.png
+++ /dev/null
Binary files differ
diff --git a/res/mipmap-xxxhdpi/ic_contacts_launcher.png b/res/mipmap-xxxhdpi/ic_contacts_launcher.png
index 74c41792f..328e067ee 100644
--- a/res/mipmap-xxxhdpi/ic_contacts_launcher.png
+++ b/res/mipmap-xxxhdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/res/mipmap-xxxhdpi/ic_contacts_launcher_foreground.png b/res/mipmap-xxxhdpi/ic_contacts_launcher_foreground.png
deleted file mode 100644
index 4b1a4b41b..000000000
--- a/res/mipmap-xxxhdpi/ic_contacts_launcher_foreground.png
+++ /dev/null
Binary files differ
diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml
index 7d9eb336e..7a0fce5fa 100644
--- a/res/values-sw600dp-land/dimens.xml
+++ b/res/values-sw600dp-land/dimens.xml
@@ -17,7 +17,6 @@
<!-- Copied from java/com/google/android/assets/launchscreens/res/values-sw600dp-land-v21/dimens.xml -->
<!-- Values adjusted for nav bar size due to windowDrawsSystemBarBackgrounds -->
<dimen name="launchscreens_product_logo_bottom">72dp</dimen>
- <dimen name="launchscreens_google_logo_bottom">96dp</dimen>
<!-- Height for the image for empty group view-->
<dimen name="empty_view_image_height">180dp</dimen>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index a38364c2f..18b43d9da 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -17,7 +17,6 @@
<!-- Copied from java/com/google/android/assets/launchscreens/res/values-sw600dp-port-v21/dimens.xml -->
<!-- Values adjusted for nav bar size due to windowDrawsSystemBarBackgrounds -->
<dimen name="launchscreens_product_logo_bottom">72dp</dimen>
- <dimen name="launchscreens_google_logo_bottom">96dp</dimen>
<dimen name="editor_type_label_width">122dip</dimen>
<dimen name="shortcut_icon_size">64dip</dimen>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index e311ff3d7..aeba87716 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -14,8 +14,6 @@
limitations under the License.
-->
<resources>
- <!-- Adaptive icon background layer color -->
- <color name="ic_contacts_launcher_background">#2458CA</color>
<color name="ic_add_contact_shortcut_background">#F5F5F5</color>
<!-- 87% black -->
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index c14d3961d..f92cf79fd 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -19,7 +19,6 @@
<!-- Copied from java/com/google/android/assets/launchscreens/res/values-port-v21/dimens.xml -->
<!-- Values adjusted for nav bar size due to windowDrawsSystemBarBackgrounds -->
<dimen name="launchscreens_product_logo_bottom">64dp</dimen>
- <dimen name="launchscreens_google_logo_bottom">104dp</dimen>
<!-- Initial height of transparent space above QuickContacts -->
<dimen name="quickcontact_starting_empty_height">150dp</dimen>