Dialer: Align contacts tab with Messaging
* The colors on Messaging have been altered in commit 52eeac0 and we
can also use these to make them look the same / similar
* Remove the product_logo pngs as we can use vector drawables here just
fine
Change-Id: Id56355b10a43616d3409027c06b04a0016538a36
diff --git a/assets/product/AndroidManifest.xml b/assets/product/AndroidManifest.xml
deleted file mode 100644
index d922f6b..0000000
--- a/assets/product/AndroidManifest.xml
+++ /dev/null
@@ -1,20 +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
- -->
-<manifest
- package="com.google.android.assets.product">
- <application/>
-</manifest>
diff --git a/assets/product/res/drawable-mdpi/product_logo_avatar_anonymous_white_color_120.png b/assets/product/res/drawable-mdpi/product_logo_avatar_anonymous_white_color_120.png
deleted file mode 100644
index 0524cf0..0000000
--- a/assets/product/res/drawable-mdpi/product_logo_avatar_anonymous_white_color_120.png
+++ /dev/null
Binary files differ
diff --git a/assets/product/res/drawable-xhdpi/product_logo_avatar_anonymous_white_color_120.png b/assets/product/res/drawable-xhdpi/product_logo_avatar_anonymous_white_color_120.png
deleted file mode 100644
index ba27ee7..0000000
--- a/assets/product/res/drawable-xhdpi/product_logo_avatar_anonymous_white_color_120.png
+++ /dev/null
Binary files differ
diff --git a/assets/product/res/drawable-xxhdpi/product_logo_avatar_anonymous_white_color_120.png b/assets/product/res/drawable-xxhdpi/product_logo_avatar_anonymous_white_color_120.png
deleted file mode 100644
index 2dc7248..0000000
--- a/assets/product/res/drawable-xxhdpi/product_logo_avatar_anonymous_white_color_120.png
+++ /dev/null
Binary files differ
diff --git a/assets/product/res/drawable-xxxhdpi/product_logo_avatar_anonymous_white_color_120.png b/assets/product/res/drawable-xxxhdpi/product_logo_avatar_anonymous_white_color_120.png
deleted file mode 100644
index 230be8c..0000000
--- a/assets/product/res/drawable-xxxhdpi/product_logo_avatar_anonymous_white_color_120.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/lettertile/LetterTileDrawable.java b/java/com/android/dialer/lettertile/LetterTileDrawable.java
index 3af9053..efe595e 100644
--- a/java/com/android/dialer/lettertile/LetterTileDrawable.java
+++ b/java/com/android/dialer/lettertile/LetterTileDrawable.java
@@ -83,10 +83,6 @@
public static final int SHAPE_RECTANGLE = 2;
- /** 54% opacity */
- private static final int ALPHA = 138;
- /** 100% opacity */
- private static final int SPAM_ALPHA = 255;
/** Default icon scale for vector drawable. */
private static final float VECTOR_ICON_SCALE = 0.7f;
@@ -126,8 +122,7 @@
defaultColor = res.getColor(R.color.letter_tile_default_color);
tileFontColor = res.getColor(R.color.letter_tile_font_color);
letterToTileRatio = res.getFraction(R.dimen.letter_to_tile_ratio, 1, 1);
- defaultPersonAvatar =
- res.getDrawable(R.drawable.product_logo_avatar_anonymous_white_color_120, null);
+ defaultPersonAvatar = res.getDrawable(R.drawable.quantum_ic_person_vd_theme_24, null);
defaultBusinessAvatar = res.getDrawable(R.drawable.quantum_ic_business_vd_theme_24, null);
defaultVoicemailAvatar = res.getDrawable(R.drawable.quantum_ic_voicemail_vd_theme_24, null);
defaultSpamAvatar = res.getDrawable(R.drawable.quantum_ic_report_vd_theme_24, null);
@@ -173,6 +168,7 @@
case TYPE_PERSON:
case TYPE_GENERIC_AVATAR:
default:
+ scale = VECTOR_ICON_SCALE;
return defaultPersonAvatar;
}
}
@@ -222,7 +218,6 @@
paint.getTextBounds(firstChar, 0, 1, rect);
paint.setTypeface(Typeface.create("sans-serif", Typeface.NORMAL));
paint.setColor(tileFontColor);
- paint.setAlpha(ALPHA);
// Draw the letter in the canvas, vertically shifted up or down by the user-defined
// offset
@@ -242,7 +237,6 @@
}
drawable.setBounds(getScaledBounds(scale, offset));
- drawable.setAlpha(drawable == defaultSpamAvatar ? SPAM_ALPHA : ALPHA);
drawable.draw(canvas);
}
}
diff --git a/java/com/android/dialer/lettertile/res/values/colors.xml b/java/com/android/dialer/lettertile/res/values/colors.xml
index 406b490..5a5452a 100644
--- a/java/com/android/dialer/lettertile/res/values/colors.xml
+++ b/java/com/android/dialer/lettertile/res/values/colors.xml
@@ -16,20 +16,18 @@
-->
<resources>
<array name="letter_tile_colors">
- <item>#DB4437</item>
- <item>#E91E63</item>
- <item>#9C27B0</item>
- <item>#673AB7</item>
- <item>#3F51B5</item>
- <item>#4285F4</item>
- <item>#039BE5</item>
- <item>#0097A7</item>
- <item>#009688</item>
- <item>#0F9D58</item>
- <item>#689F38</item>
- <item>#EF6C00</item>
- <item>#FF5722</item>
- <item>#757575</item>
+ <item>@*android:color/system_accent1_300</item>
+ <item>@*android:color/system_accent2_300</item>
+ <item>@*android:color/system_accent3_300</item>
+ <item>@*android:color/system_accent1_400</item>
+ <item>@*android:color/system_accent2_400</item>
+ <item>@*android:color/system_accent3_400</item>
+ <item>@*android:color/system_accent1_500</item>
+ <item>@*android:color/system_accent2_500</item>
+ <item>@*android:color/system_accent3_500</item>
+ <item>@*android:color/system_accent1_600</item>
+ <item>@*android:color/system_accent2_600</item>
+ <item>@*android:color/system_accent3_600</item>
</array>
<color name="spam_contact_background">#A52714</color>
@@ -37,4 +35,4 @@
<color name="letter_tile_default_color">#cccccc</color>
<color name="letter_tile_font_color">#ffffff</color>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/java/com/android/dialer/speeddial/SpeedDialFragment.java b/java/com/android/dialer/speeddial/SpeedDialFragment.java
index cc4cc36..9cf284c 100644
--- a/java/com/android/dialer/speeddial/SpeedDialFragment.java
+++ b/java/com/android/dialer/speeddial/SpeedDialFragment.java
@@ -508,7 +508,7 @@
Uri.withAppendedPath(
Contacts.CONTENT_URI, String.valueOf(speedDialUiItem.contactId()))),
R.string.contact_menu_contact_info,
- R.drawable.context_menu_contact_icon));
+ R.drawable.quantum_ic_person_vd_theme_24));
bottomSheet = HistoryItemActionBottomSheet.show(getContext(), headerInfo, modules);
}
diff --git a/java/com/android/dialer/speeddial/res/drawable/context_menu_contact_icon.xml b/java/com/android/dialer/speeddial/res/drawable/context_menu_contact_icon.xml
deleted file mode 100644
index ee9cde1..0000000
--- a/java/com/android/dialer/speeddial/res/drawable/context_menu_contact_icon.xml
+++ /dev/null
@@ -1,30 +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
- -->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
- <item>
- <shape android:shape="oval">
- <solid android:color="?colorIcon"/>
- <size android:width="24dp" android:height="24dp"/>
- </shape>
- </item>
- <item
- android:width="24dp"
- android:height="24dp"
- android:gravity="center"
- android:drawable="@drawable/product_logo_avatar_anonymous_white_color_120"/>
-</layer-list>
\ No newline at end of file
diff --git a/java/com/android/dialer/speeddial/res/menu/starred_contact_context_menu.xml b/java/com/android/dialer/speeddial/res/menu/starred_contact_context_menu.xml
index 2ff2524..74cab32 100644
--- a/java/com/android/dialer/speeddial/res/menu/starred_contact_context_menu.xml
+++ b/java/com/android/dialer/speeddial/res/menu/starred_contact_context_menu.xml
@@ -47,6 +47,6 @@
<item
android:id="@+id/contact_info_container"
android:title="@string/contact_menu_contact_info"
- android:icon="@drawable/context_menu_contact_icon"
+ android:icon="@drawable/quantum_ic_person_vd_theme_24"
android:iconTint="#FFFFFF"/>
-</menu>
\ No newline at end of file
+</menu>
