summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/contactsfragment
diff options
context:
space:
mode:
authorcalderwoodra <calderwoodra@google.com>2018-05-19 00:05:02 -0700
committerCopybara-Service <copybara-piper@google.com>2018-05-21 13:17:30 -0700
commit929539eb864822d669265b142bdcc49b6cf8ea6b (patch)
treefcaef3fac4068e3669ca5916f7a743d0d5e41bbb /java/com/android/dialer/contactsfragment
parentea7399a7c0c8a3832a6592aee0a0372c300b11f5 (diff)
Implement a global theme to be easily configured in Dialer.
deleted several colors and unified them across the app migrated several alert dialogs to support alert dialogs added many todos migrated several tests from GoogleRobolectricTestRunner to RobolectricTestRunner Because of the test migration: - moved dialpad theme attributes into dialpad/theme - moved incall ui theme attributes into incallui/theme Bug: 79883035 Test: tap PiperOrigin-RevId: 197246477 Change-Id: Ifc534793bc32757bbbf2007a7c40287c8d0817ad
Diffstat (limited to 'java/com/android/dialer/contactsfragment')
-rw-r--r--java/com/android/dialer/contactsfragment/res/drawable/fast_scroller_container_background.xml2
-rw-r--r--java/com/android/dialer/contactsfragment/res/drawable/fast_scroller_scroll_bar.xml2
-rw-r--r--java/com/android/dialer/contactsfragment/res/layout/add_contact_row.xml4
-rw-r--r--java/com/android/dialer/contactsfragment/res/layout/fragment_contacts.xml4
-rw-r--r--java/com/android/dialer/contactsfragment/res/layout/header.xml2
5 files changed, 7 insertions, 7 deletions
diff --git a/java/com/android/dialer/contactsfragment/res/drawable/fast_scroller_container_background.xml b/java/com/android/dialer/contactsfragment/res/drawable/fast_scroller_container_background.xml
index a7b227799..87d123ad0 100644
--- a/java/com/android/dialer/contactsfragment/res/drawable/fast_scroller_container_background.xml
+++ b/java/com/android/dialer/contactsfragment/res/drawable/fast_scroller_container_background.xml
@@ -16,7 +16,7 @@
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
- <solid android:color="@color/dialer_theme_color"/>
+ <solid android:color="?android:attr/colorPrimary"/>
<size
android:height="@dimen/fast_scroller_container_size"
android:width="@dimen/fast_scroller_container_size"/>
diff --git a/java/com/android/dialer/contactsfragment/res/drawable/fast_scroller_scroll_bar.xml b/java/com/android/dialer/contactsfragment/res/drawable/fast_scroller_scroll_bar.xml
index a3e0c25c7..4683616e8 100644
--- a/java/com/android/dialer/contactsfragment/res/drawable/fast_scroller_scroll_bar.xml
+++ b/java/com/android/dialer/contactsfragment/res/drawable/fast_scroller_scroll_bar.xml
@@ -17,7 +17,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true">
<shape android:shape="rectangle">
- <solid android:color="@color/dialer_theme_color"/>
+ <solid android:color="?android:attr/colorPrimary"/>
<size android:height="32dp" android:width="4dp"/>
<corners android:radius="2dp"/>
</shape>
diff --git a/java/com/android/dialer/contactsfragment/res/layout/add_contact_row.xml b/java/com/android/dialer/contactsfragment/res/layout/add_contact_row.xml
index dbc7cafb8..bc5f712f0 100644
--- a/java/com/android/dialer/contactsfragment/res/layout/add_contact_row.xml
+++ b/java/com/android/dialer/contactsfragment/res/layout/add_contact_row.xml
@@ -34,7 +34,7 @@
android:layout_width="@dimen/photo_size"
android:layout_height="@dimen/photo_size"
android:src="@drawable/quantum_ic_person_add_white_24"
- android:tint="@color/dialer_theme_color"
+ android:tint="?android:attr/colorPrimary"
android:scaleType="center"/>
<TextView
@@ -46,5 +46,5 @@
android:gravity="center_vertical"
android:fontFamily="sans-serif"
android:text="@string/all_contacts_empty_add_contact_action"
- style="@style/PrimaryText"/>
+ style="@style/Dialer.TextAppearance.Primary"/>
</LinearLayout>
diff --git a/java/com/android/dialer/contactsfragment/res/layout/fragment_contacts.xml b/java/com/android/dialer/contactsfragment/res/layout/fragment_contacts.xml
index 7bc3b34a5..8d04fe512 100644
--- a/java/com/android/dialer/contactsfragment/res/layout/fragment_contacts.xml
+++ b/java/com/android/dialer/contactsfragment/res/layout/fragment_contacts.xml
@@ -23,7 +23,7 @@
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/background_dialer_light"
+ android:background="?android:attr/colorBackgroundFloating"
android:paddingBottom="@dimen/floating_action_button_list_bottom_padding"
android:clipToPadding="false"/>
@@ -45,7 +45,7 @@
android:layout_toLeftOf="@+id/fast_scroller_scroll_bar"
android:gravity="center"
android:textSize="48sp"
- android:textColor="@color/background_dialer_white"
+ android:textColor="?android:attr/colorBackground"
android:visibility="gone"
android:background="@drawable/fast_scroller_container_background"/>
diff --git a/java/com/android/dialer/contactsfragment/res/layout/header.xml b/java/com/android/dialer/contactsfragment/res/layout/header.xml
index cb5e78a57..e75c7dc5a 100644
--- a/java/com/android/dialer/contactsfragment/res/layout/header.xml
+++ b/java/com/android/dialer/contactsfragment/res/layout/header.xml
@@ -19,7 +19,7 @@
android:id="@+id/header"
android:layout_width="@dimen/header_width"
android:layout_height="@dimen/row_height"
- android:textColor="@color/dialer_theme_color"
+ android:textColor="?android:attr/colorPrimary"
android:gravity="center"
android:textSize="@dimen/text_size"
android:textStyle="bold"