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
---
 .../dialer/speeddial/res/drawable/context_menu_background.xml     | 2 +-
 java/com/android/dialer/speeddial/res/drawable/favorite_icon.xml  | 4 ++--
 .../dialer/speeddial/res/layout/disambig_dialog_layout.xml        | 8 +++-----
 .../dialer/speeddial/res/layout/disambig_option_header_layout.xml | 4 +---
 .../dialer/speeddial/res/layout/disambig_option_layout.xml        | 4 ++--
 .../android/dialer/speeddial/res/layout/favorite_item_layout.xml  | 4 ++--
 .../android/dialer/speeddial/res/layout/fragment_speed_dial.xml   | 2 +-
 .../dialer/speeddial/res/layout/speed_dial_header_layout.xml      | 4 ++--
 .../android/dialer/speeddial/res/layout/suggestion_row_layout.xml | 6 +++---
 java/com/android/dialer/speeddial/res/values/styles.xml           | 2 +-
 10 files changed, 18 insertions(+), 22 deletions(-)

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

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
index c828860b2..2b36457fc 100644
--- a/java/com/android/dialer/speeddial/res/drawable/context_menu_background.xml
+++ b/java/com/android/dialer/speeddial/res/drawable/context_menu_background.xml
@@ -21,6 +21,6 @@
       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="@color/background_dialer_white"/>
+  <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/favorite_icon.xml b/java/com/android/dialer/speeddial/res/drawable/favorite_icon.xml
index 81b018ff1..565877d30 100644
--- a/java/com/android/dialer/speeddial/res/drawable/favorite_icon.xml
+++ b/java/com/android/dialer/speeddial/res/drawable/favorite_icon.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_light" android:width="3dp"/>
+  <solid android:color="?android:attr/colorPrimary"/>
+  <stroke android:color="?android:attr/colorBackground" android:width="3dp"/>
 </shape>
\ No newline at end of file
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 aec081385..e395d4bd6 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
@@ -31,10 +31,8 @@
       android:paddingEnd="24dp"
       android:elevation="1dp"
       android:text="@string/speed_dial_disambig_dialog_title"
-      android:textSize="20sp"
-      android:textColor="@color/dialer_primary_text_color"
-      android:fontFamily="sans-serif-medium"
-      android:background="@android:color/white"/>
+      android:background="?android:attr/colorBackgroundFloating"
+      style="@style/Dialer.TextAppearance.Header"/>
 
   <com.android.dialer.widget.MaxHeightScrollView
       android:id="@+id/disambig_scrollview"
@@ -57,7 +55,7 @@
       android:layout_gravity="bottom"
       android:minHeight="64dp"
       android:elevation="4dp"
-      android:background="@android:color/white">
+      android:background="?android:attr/colorBackgroundFloating">
 
     <CheckBox
         android:id="@+id/remember_this_choice_checkbox"
diff --git a/java/com/android/dialer/speeddial/res/layout/disambig_option_header_layout.xml b/java/com/android/dialer/speeddial/res/layout/disambig_option_header_layout.xml
index 22a5d1b52..ffda3675e 100644
--- a/java/com/android/dialer/speeddial/res/layout/disambig_option_header_layout.xml
+++ b/java/com/android/dialer/speeddial/res/layout/disambig_option_header_layout.xml
@@ -23,6 +23,4 @@
     android:minHeight="48dp"
     android:paddingStart="24dp"
     android:paddingEnd="24dp"
-    android:textSize="14sp"
-    android:textColor="#757575"
-    style="@style/PrimaryText"/>
+    style="@style/Dialer.TextAppearance.Secondary"/>
diff --git a/java/com/android/dialer/speeddial/res/layout/disambig_option_layout.xml b/java/com/android/dialer/speeddial/res/layout/disambig_option_layout.xml
index a1a5b2941..038800548 100644
--- a/java/com/android/dialer/speeddial/res/layout/disambig_option_layout.xml
+++ b/java/com/android/dialer/speeddial/res/layout/disambig_option_layout.xml
@@ -29,7 +29,7 @@
       android:layout_width="24dp"
       android:layout_height="24dp"
       android:layout_gravity="center_vertical"
-      android:tint="@color/dialer_secondary_text_color"/>
+      android:tint="?colorIcon"/>
 
   <TextView
       android:id="@+id/disambig_option_text"
@@ -37,5 +37,5 @@
       android:layout_height="wrap_content"
       android:layout_marginStart="16dp"
       android:layout_gravity="center_vertical"
-      style="@style/PrimaryText"/>
+      style="@style/Dialer.TextAppearance.Primary"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/speeddial/res/layout/favorite_item_layout.xml b/java/com/android/dialer/speeddial/res/layout/favorite_item_layout.xml
index a0bbfbd36..a8bc55bb7 100644
--- a/java/com/android/dialer/speeddial/res/layout/favorite_item_layout.xml
+++ b/java/com/android/dialer/speeddial/res/layout/favorite_item_layout.xml
@@ -68,7 +68,7 @@
       android:layout_marginBottom="1dp"
       android:fontFamily="sans-serif-medium"
       android:textSize="14sp"
-      style="@style/PrimaryText"/>
+      style="@style/Dialer.TextAppearance.Primary"/>
 
   <TextView
       android:id="@+id/phone_type"
@@ -78,5 +78,5 @@
       android:layout_marginStart="4dp"
       android:layout_marginEnd="4dp"
       android:layout_marginBottom="17dp"
-      style="@style/SecondaryText"/>
+      style="@style/Dialer.TextAppearance.Secondary"/>
 </LinearLayout>
\ No newline at end of file
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 1e35091c9..57f8885ff 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="@color/background_dialer_light"
+      android:background="?android:attr/colorBackgroundFloating"
       android:paddingBottom="@dimen/floating_action_button_list_bottom_padding"/>
 
   <com.android.dialer.widget.EmptyContentView
diff --git a/java/com/android/dialer/speeddial/res/layout/speed_dial_header_layout.xml b/java/com/android/dialer/speeddial/res/layout/speed_dial_header_layout.xml
index 1605e8c98..1a9d09297 100644
--- a/java/com/android/dialer/speeddial/res/layout/speed_dial_header_layout.xml
+++ b/java/com/android/dialer/speeddial/res/layout/speed_dial_header_layout.xml
@@ -27,7 +27,7 @@
       android:layout_height="wrap_content"
       android:layout_centerVertical="true"
       android:textSize="16sp"
-      style="@style/SecondaryText"/>
+      style="@style/Dialer.TextAppearance.Secondary"/>
 
   <Button
       android:id="@+id/speed_dial_add_button"
@@ -40,6 +40,6 @@
       android:paddingStart="8dp"
       android:paddingEnd="8dp"
       android:text="@string/speed_dial_add_button_text"
-      android:textColor="@color/dialer_theme_color"
+      android:textColor="?android:attr/colorPrimary"
       style="@style/Widget.AppCompat.Button.Borderless"/>
 </RelativeLayout>
\ No newline at end of file
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 f072c69e2..96532fb82 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
@@ -41,13 +41,13 @@
         android:id="@+id/name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        style="@style/PrimaryText"/>
+        style="@style/Dialer.TextAppearance.Primary"/>
 
     <TextView
         android:id="@+id/number"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        style="@style/SecondaryText"/>
+        style="@style/Dialer.TextAppearance.Secondary"/>
   </LinearLayout>
 
   <ImageView
@@ -59,6 +59,6 @@
       android:scaleType="center"
       android:tint="@color/secondary_text_color"
       android:src="@drawable/quantum_ic_more_vert_white_24"
-      android:background="?android:selectableItemBackgroundBorderless"
+      android:background="?android:attr/selectableItemBackgroundBorderless"
       android:contentDescription="@string/content_description_overflow"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/speeddial/res/values/styles.xml b/java/com/android/dialer/speeddial/res/values/styles.xml
index 46dbc359a..38f31c3ed 100644
--- a/java/com/android/dialer/speeddial/res/values/styles.xml
+++ b/java/com/android/dialer/speeddial/res/values/styles.xml
@@ -19,7 +19,7 @@
     <item name="android:drawableTint">@color/secondary_text_color</item>
   </style>
 
-  <style name="SpeedDialContextMenuItem.NoDrawableTint" parent="SecondaryText">
+  <style name="SpeedDialContextMenuItem.NoDrawableTint" parent="Dialer.TextAppearance.Secondary">
     <item name="android:paddingStart">12dp</item>
     <item name="android:minHeight">48dp</item>
     <item name="android:gravity">center_vertical</item>
-- 
cgit v1.2.3