From 929539eb864822d669265b142bdcc49b6cf8ea6b Mon Sep 17 00:00:00 2001
From: calderwoodra <calderwoodra@google.com>
Date: Sat, 19 May 2018 00:05:02 -0700
Subject: 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
---
 java/com/android/dialer/widget/res/color/dialer_tint_state.xml    | 4 ++--
 .../dialer/widget/res/drawable/contact_photo_badge_background.xml | 4 ++--
 .../android/dialer/widget/res/drawable/edittext_custom_cursor.xml | 2 +-
 java/com/android/dialer/widget/res/layout/dialer_toolbar.xml      | 4 ++--
 java/com/android/dialer/widget/res/layout/fragment_message.xml    | 8 ++++----
 5 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'java/com/android/dialer/widget')

diff --git a/java/com/android/dialer/widget/res/color/dialer_tint_state.xml b/java/com/android/dialer/widget/res/color/dialer_tint_state.xml
index c29f334ac..84b2bc03b 100644
--- a/java/com/android/dialer/widget/res/color/dialer_tint_state.xml
+++ b/java/com/android/dialer/widget/res/color/dialer_tint_state.xml
@@ -18,6 +18,6 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:color="@color/dialer_edit_text_hint_color" android:state_enabled="false"/>
-  <item android:color="@color/dialer_theme_color"/>
+  <item android:color="?android:attr/textColorHint" android:state_enabled="false"/>
+  <item android:color="?android:attr/colorPrimary"/>
 </selector>
\ No newline at end of file
diff --git a/java/com/android/dialer/widget/res/drawable/contact_photo_badge_background.xml b/java/com/android/dialer/widget/res/drawable/contact_photo_badge_background.xml
index 4dcc7057e..76af60066 100644
--- a/java/com/android/dialer/widget/res/drawable/contact_photo_badge_background.xml
+++ b/java/com/android/dialer/widget/res/drawable/contact_photo_badge_background.xml
@@ -18,6 +18,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
 
-  <solid android:color="@color/dialer_theme_color"/>
-  <stroke android:color="@color/background_dialer_white" android:width="2dp"/>
+  <solid android:color="?android:attr/colorPrimary"/>
+  <stroke android:color="?android:attr/colorBackground" android:width="2dp"/>
 </shape>
\ No newline at end of file
diff --git a/java/com/android/dialer/widget/res/drawable/edittext_custom_cursor.xml b/java/com/android/dialer/widget/res/drawable/edittext_custom_cursor.xml
index 2f01628aa..62cd9abb6 100644
--- a/java/com/android/dialer/widget/res/drawable/edittext_custom_cursor.xml
+++ b/java/com/android/dialer/widget/res/drawable/edittext_custom_cursor.xml
@@ -17,5 +17,5 @@
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
   <size android:width="2dp"/>
-  <solid android:color="@color/dialtacts_theme_color"/>
+  <solid android:color="?android:attr/colorPrimary"/>
 </shape>
\ No newline at end of file
diff --git a/java/com/android/dialer/widget/res/layout/dialer_toolbar.xml b/java/com/android/dialer/widget/res/layout/dialer_toolbar.xml
index 023b0ffe2..0540a00bc 100644
--- a/java/com/android/dialer/widget/res/layout/dialer_toolbar.xml
+++ b/java/com/android/dialer/widget/res/layout/dialer_toolbar.xml
@@ -28,7 +28,7 @@
         android:layout_height="wrap_content"
         android:gravity="top"
         android:textSize="@dimen/toolbar_title_text_size"
-        android:textColor="@color/background_dialer_white"
+        android:textColor="?android:attr/colorBackground"
         android:fontFamily="sans-serif-medium"
         android:maxLines="1"
         android:ellipsize="end"/>
@@ -38,7 +38,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="@dimen/toolbar_subtitle_text_size"
-        android:textColor="@color/background_dialer_white"
+        android:textColor="?android:attr/colorBackground"
         android:visibility="gone"
         android:maxLines="1"
         android:ellipsize="end"/>
diff --git a/java/com/android/dialer/widget/res/layout/fragment_message.xml b/java/com/android/dialer/widget/res/layout/fragment_message.xml
index ac62dd91b..388a8d55a 100644
--- a/java/com/android/dialer/widget/res/layout/fragment_message.xml
+++ b/java/com/android/dialer/widget/res/layout/fragment_message.xml
@@ -18,7 +18,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="@color/background_dialer_white">
+  android:background="?android:attr/colorBackground">
 
   <ScrollView
       android:layout_width="match_parent"
@@ -53,8 +53,8 @@
       android:textSize="@dimen/message_item_text_size"
       android:hint="@string/custom_message_hint"
       android:textColor="@color/dialer_primary_text_color"
-      android:textColorHint="@color/dialer_edit_text_hint_color"
-      android:background="@color/background_dialer_white"
+      android:textColorHint="?android:attr/textColorHint"
+      android:background="?android:attr/colorBackground"
       android:textCursorDrawable="@drawable/edittext_custom_cursor"
       android:layout_toStartOf="@+id/count_and_send_container"
       android:inputType="textShortMessage|textCapSentences"
@@ -85,7 +85,7 @@
         android:layout_height="wrap_content"
         android:visibility="gone"
         android:textSize="@dimen/message_remaining_char_text_size"
-        android:textColor="@color/dialer_edit_text_hint_color"/>
+        android:textColor="?android:attr/textColorHint"/>
     </LinearLayout>
   </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3