summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/speeddial
diff options
context:
space:
mode:
authorcalderwoodra <calderwoodra@google.com>2018-05-22 15:30:39 -0700
committerCopybara-Service <copybara-piper@google.com>2018-05-29 23:24:53 -0700
commitc5c42189eeab0389a94717de9a66c6d00068e8bf (patch)
treefbecd02f5176af6c8c2ac6bd620e117d341e62bf /java/com/android/dialer/speeddial
parent4efd0ebf003e985e7cbe40d8ffd9f7ff227a9611 (diff)
Began implementation of Dialer dark theme.
- README on how to properly theme Dialer going forward. - Migrated all widgets to use global colors. - Removed all activity and application themes where it wasn't necessary. - Added themeing test rule for Espresso tests. Bug: 79883035 Test: tap PiperOrigin-RevId: 197634256 Change-Id: I4b7d94d45aeeb59d484b0069fdd1e200a654910b
Diffstat (limited to 'java/com/android/dialer/speeddial')
-rw-r--r--java/com/android/dialer/speeddial/res/drawable/context_menu_background.xml26
-rw-r--r--java/com/android/dialer/speeddial/res/drawable/context_menu_contact_icon.xml2
-rw-r--r--java/com/android/dialer/speeddial/res/layout/disambig_dialog_layout.xml2
-rw-r--r--java/com/android/dialer/speeddial/res/layout/fragment_speed_dial.xml2
-rw-r--r--java/com/android/dialer/speeddial/res/layout/suggestion_row_layout.xml2
-rw-r--r--java/com/android/dialer/speeddial/res/menu/starred_contact_context_menu.xml8
-rw-r--r--java/com/android/dialer/speeddial/res/values/styles.xml2
7 files changed, 9 insertions, 35 deletions
diff --git a/java/com/android/dialer/speeddial/res/drawable/context_menu_background.xml b/java/com/android/dialer/speeddial/res/drawable/context_menu_background.xml
deleted file mode 100644
index 2b36457fc..000000000
--- a/java/com/android/dialer/speeddial/res/drawable/context_menu_background.xml
+++ /dev/null
@@ -1,26 +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
- -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
- <corners
- android:bottomRightRadius="@dimen/speed_dial_context_menu_corner_radius"
- android:topRightRadius="@dimen/speed_dial_context_menu_corner_radius"
- android:bottomLeftRadius="@dimen/speed_dial_context_menu_corner_radius"
- android:topLeftRadius="@dimen/speed_dial_context_menu_corner_radius"/>
- <solid android:color="?android:attr/colorBackground"/>
- <stroke android:color="#0333" android:width="2dp"/>
-</shape> \ No newline at end of file
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
index 73260b156..ee9cde1db 100644
--- 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
@@ -18,7 +18,7 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="oval">
- <solid android:color="@color/secondary_text_color"/>
+ <solid android:color="?colorIcon"/>
<size android:width="24dp" android:height="24dp"/>
</shape>
</item>
diff --git a/java/com/android/dialer/speeddial/res/layout/disambig_dialog_layout.xml b/java/com/android/dialer/speeddial/res/layout/disambig_dialog_layout.xml
index e395d4bd6..0923c5267 100644
--- a/java/com/android/dialer/speeddial/res/layout/disambig_dialog_layout.xml
+++ b/java/com/android/dialer/speeddial/res/layout/disambig_dialog_layout.xml
@@ -32,7 +32,7 @@
android:elevation="1dp"
android:text="@string/speed_dial_disambig_dialog_title"
android:background="?android:attr/colorBackgroundFloating"
- style="@style/Dialer.TextAppearance.Header"/>
+ style="@style/Dialer.TextAppearance.Header2"/>
<com.android.dialer.widget.MaxHeightScrollView
android:id="@+id/disambig_scrollview"
diff --git a/java/com/android/dialer/speeddial/res/layout/fragment_speed_dial.xml b/java/com/android/dialer/speeddial/res/layout/fragment_speed_dial.xml
index 57f8885ff..e289bb794 100644
--- a/java/com/android/dialer/speeddial/res/layout/fragment_speed_dial.xml
+++ b/java/com/android/dialer/speeddial/res/layout/fragment_speed_dial.xml
@@ -24,7 +24,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
- android:background="?android:attr/colorBackgroundFloating"
+ android:background="?android:attr/colorBackground"
android:paddingBottom="@dimen/floating_action_button_list_bottom_padding"/>
<com.android.dialer.widget.EmptyContentView
diff --git a/java/com/android/dialer/speeddial/res/layout/suggestion_row_layout.xml b/java/com/android/dialer/speeddial/res/layout/suggestion_row_layout.xml
index 96532fb82..4e010c279 100644
--- a/java/com/android/dialer/speeddial/res/layout/suggestion_row_layout.xml
+++ b/java/com/android/dialer/speeddial/res/layout/suggestion_row_layout.xml
@@ -57,7 +57,7 @@
android:layout_centerVertical="true"
android:layout_alignParentEnd="true"
android:scaleType="center"
- android:tint="@color/secondary_text_color"
+ android:tint="?colorIcon"
android:src="@drawable/quantum_ic_more_vert_white_24"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/content_description_overflow"/>
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 0143498e1..2ff2524e6 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
@@ -24,25 +24,25 @@
android:id="@+id/voice_call_container"
android:title="@string/contact_menu_voice_call"
android:icon="@drawable/quantum_ic_phone_vd_theme_24"
- android:iconTint="@color/secondary_text_color"/>
+ android:iconTint="?colorIcon"/>
<item
android:id="@+id/video_call_container"
android:title="@string/contact_menu_video_call"
android:icon="@drawable/quantum_ic_videocam_vd_theme_24"
- android:iconTint="@color/secondary_text_color"/>
+ android:iconTint="?colorIcon"/>
<item
android:id="@+id/send_message_container"
android:title="@string/contact_menu_message"
android:icon="@drawable/quantum_ic_message_vd_theme_24"
- android:iconTint="@color/secondary_text_color"/>
+ android:iconTint="?colorIcon"/>
<item
android:id="@+id/remove_container"
android:title="@string/contact_menu_remove"
android:icon="@drawable/quantum_ic_close_vd_theme_24"
- android:iconTint="@color/secondary_text_color"/>
+ android:iconTint="?colorIcon"/>
<item
android:id="@+id/contact_info_container"
diff --git a/java/com/android/dialer/speeddial/res/values/styles.xml b/java/com/android/dialer/speeddial/res/values/styles.xml
index 38f31c3ed..99e6e3c73 100644
--- a/java/com/android/dialer/speeddial/res/values/styles.xml
+++ b/java/com/android/dialer/speeddial/res/values/styles.xml
@@ -16,7 +16,7 @@
-->
<resources>
<style name="SpeedDialContextMenuItem" parent="SpeedDialContextMenuItem.NoDrawableTint">
- <item name="android:drawableTint">@color/secondary_text_color</item>
+ <item name="android:drawableTint">?colorIcon</item>
</style>
<style name="SpeedDialContextMenuItem.NoDrawableTint" parent="Dialer.TextAppearance.Secondary">