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
---
 .../res/layout-land/dialpad_fragment.xml           |  2 +-
 .../res/layout-land/dialpad_key_one.xml            |  2 +-
 .../res/layout/dialpad_chooser_list_item.xml       |  3 +-
 .../dialpadview/res/layout/dialpad_fragment.xml    |  2 +-
 .../dialpadview/res/layout/dialpad_key_one.xml     |  2 +-
 .../dialer/dialpadview/res/values/attrs.xml        | 41 -----------------
 .../dialer/dialpadview/res/values/colors.xml       | 25 -----------
 .../dialer/dialpadview/res/values/dimens.xml       |  8 ----
 .../dialer/dialpadview/res/values/styles.xml       | 37 +---------------
 .../dialer/dialpadview/theme/AndroidManifest.xml   | 16 +++++++
 .../dialer/dialpadview/theme/res/values/attr.xml   | 40 +++++++++++++++++
 .../dialer/dialpadview/theme/res/values/dimens.xml | 27 ++++++++++++
 .../dialer/dialpadview/theme/res/values/styles.xml | 51 ++++++++++++++++++++++
 13 files changed, 140 insertions(+), 116 deletions(-)
 delete mode 100644 java/com/android/dialer/dialpadview/res/values/attrs.xml
 delete mode 100644 java/com/android/dialer/dialpadview/res/values/colors.xml
 create mode 100644 java/com/android/dialer/dialpadview/theme/AndroidManifest.xml
 create mode 100644 java/com/android/dialer/dialpadview/theme/res/values/attr.xml
 create mode 100644 java/com/android/dialer/dialpadview/theme/res/values/dimens.xml
 create mode 100644 java/com/android/dialer/dialpadview/theme/res/values/styles.xml

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

diff --git a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_fragment.xml b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_fragment.xml
index a2fbbab18..7f82d74fe 100644
--- a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_fragment.xml
+++ b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_fragment.xml
@@ -57,7 +57,7 @@
           android:id="@+id/dialpadChooser"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:background="@color/background_dialer_light"
+          android:background="?android:attr/colorBackgroundFloating"
           android:visibility="gone"/>
 
       <!-- Margin bottom and alignParentBottom don't work well together, so use a Space instead. -->
diff --git a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_one.xml b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_one.xml
index 0a770c24a..55bf09273 100644
--- a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_one.xml
+++ b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_one.xml
@@ -46,7 +46,7 @@
           android:layout_height="@dimen/dialpad_voicemail_icon_size"
           android:scaleType="fitCenter"
           android:src="@drawable/quantum_ic_voicemail_white_24"
-          android:tint="@color/dialpad_voicemail_tint"/>
+          android:tint="?colorIcon"/>
     </LinearLayout>
 
     <!-- A placeholder to make the width the same as other dialpad keys. -->
diff --git a/java/com/android/dialer/dialpadview/res/layout/dialpad_chooser_list_item.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad_chooser_list_item.xml
index e00529614..43df76fe8 100644
--- a/java/com/android/dialer/dialpadview/res/layout/dialpad_chooser_list_item.xml
+++ b/java/com/android/dialer/dialpadview/res/layout/dialpad_chooser_list_item.xml
@@ -33,6 +33,5 @@
     android:layout_weight="1"
     android:layout_gravity="center_vertical"
     android:textAppearance="?android:attr/textAppearanceMedium"
-    android:textColor="@color/dialpad_primary_text_color"/>
-
+    android:textColor="?android:attr/colorPrimary"/>
 </LinearLayout>
diff --git a/java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml
index 4a8ac0786..d3ebeb06c 100644
--- a/java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml
+++ b/java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml
@@ -46,7 +46,7 @@
         android:id="@+id/dialpadChooser"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/background_dialer_light"
+        android:background="?android:attr/colorBackgroundFloating"
         android:visibility="gone"/>
 
   </LinearLayout>
diff --git a/java/com/android/dialer/dialpadview/res/layout/dialpad_key_one.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad_key_one.xml
index 599c2d8e6..0d8a0f098 100644
--- a/java/com/android/dialer/dialpadview/res/layout/dialpad_key_one.xml
+++ b/java/com/android/dialer/dialpadview/res/layout/dialpad_key_one.xml
@@ -46,7 +46,7 @@
           android:layout_height="@dimen/dialpad_voicemail_icon_size"
           android:scaleType="fitCenter"
           android:src="@drawable/quantum_ic_voicemail_white_24"
-          android:tint="?attr/dialpad_voicemail_tint"/>
+          android:tint="?colorIcon"/>
     </LinearLayout>
   </LinearLayout>
 </com.android.dialer.dialpadview.DialpadKeyButton>
diff --git a/java/com/android/dialer/dialpadview/res/values/attrs.xml b/java/com/android/dialer/dialpadview/res/values/attrs.xml
deleted file mode 100644
index 61c9c208e..000000000
--- a/java/com/android/dialer/dialpadview/res/values/attrs.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
-  ~ Copyright (C) 2012 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.
-  -->
-
-<resources>
-
-  <attr format="reference" name="dialpad_style"/>
-  <attr format="dimension" name="dialpad_end_key_spacing"/>
-
-  <declare-styleable name="Dialpad">
-    <attr format="color" name="dialpad_key_button_touch_tint"/>
-    <attr format="dimension" name="dialpad_digits_adjustable_text_size"/>
-    <attr format="dimension" name="dialpad_digits_adjustable_height"/>
-    <attr format="dimension" name="dialpad_key_letters_size_for_dual_alphabets"/>
-    <attr format="dimension" name="dialpad_key_letters_size_for_single_alphabet"/>
-    <attr format="dimension" name="dialpad_key_numbers_size"/>
-    <attr format="dimension" name="dialpad_key_number_margin_bottom"/>
-  </declare-styleable>
-
-  <declare-styleable name="Theme.Dialpad">
-    <attr format="color" name="dialpad_text_color"/>
-    <attr format="color" name="dialpad_text_color_primary"/>
-    <attr format="color" name="dialpad_text_color_secondary"/>
-    <attr format="color" name="dialpad_icon_tint"/>
-    <attr format="color" name="dialpad_voicemail_tint"/>
-    <attr format="color" name="dialpad_background"/>
-    <attr format="dimension" name="dialpad_elevation"/>
-  </declare-styleable>
-</resources>
diff --git a/java/com/android/dialer/dialpadview/res/values/colors.xml b/java/com/android/dialer/dialpadview/res/values/colors.xml
deleted file mode 100644
index 8bea35710..000000000
--- a/java/com/android/dialer/dialpadview/res/values/colors.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-  ~ Copyright (C) 2012 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
-  -->
-
-<resources>
-  <!-- Colors for the dialpad -->
-  <color name="background_dialpad">#fcfcfc</color>
-  <color name="dialpad_primary_text_color">@color/dialer_theme_color</color>
-  <color name="dialpad_secondary_text_color">#737373</color>
-  <color name="dialpad_digits_text_color">#333</color>
-  <color name="dialpad_icon_tint">#89000000</color>
-  <color name="dialpad_voicemail_tint">#919191</color>
-</resources>
diff --git a/java/com/android/dialer/dialpadview/res/values/dimens.xml b/java/com/android/dialer/dialpadview/res/values/dimens.xml
index 6892fcf30..f77c9ab7a 100644
--- a/java/com/android/dialer/dialpadview/res/values/dimens.xml
+++ b/java/com/android/dialer/dialpadview/res/values/dimens.xml
@@ -16,17 +16,11 @@
 
 <resources>
   <!-- Text dimensions for dialpad keys -->
-  <dimen name="dialpad_key_numbers_default_size">36dp</dimen>
-  <dimen name="dialpad_key_letters_default_size_for_single_alphabet">12sp</dimen>
-  <dimen name="dialpad_key_letters_default_size_for_dual_alphabets">10sp</dimen>
   <dimen name="dialpad_key_pound_size">23sp</dimen>
   <dimen name="dialpad_key_star_size">36sp</dimen>
   <dimen name="dialpad_key_height">64dp</dimen>
-  <dimen name="dialpad_key_number_default_margin_bottom">3dp</dimen>
   <dimen name="dialpad_symbol_margin_bottom">13dp</dimen>
-  <dimen name="dialpad_digits_text_size">34sp</dimen>
   <dimen name="dialpad_digits_text_min_size">24sp</dimen>
-  <dimen name="dialpad_digits_height">60dp</dimen>
   <dimen name="dialpad_digits_padding">16dp</dimen>
   <dimen name="dialpad_digits_menu_left_padding">8dp</dimen>
   <dimen name="dialpad_digits_menu_right_padding">10dp</dimen>
@@ -35,8 +29,6 @@
   <dimen name="dialpad_overflow_margin">8dp</dimen>
   <dimen name="dialpad_space_above_keys">14dp</dimen>
   <dimen name="dialpad_space_below_keys">8dp</dimen>
-  <!-- The bottom space of the dialpad to account for the dial button -->
-  <dimen name="dialpad_bottom_space_height">80dp</dimen>
 
   <!-- Top/Bottom padding around the ILD rate display box. -->
   <dimen name="ild_margin_height">10dp</dimen>
diff --git a/java/com/android/dialer/dialpadview/res/values/styles.xml b/java/com/android/dialer/dialpadview/res/values/styles.xml
index 75a54a305..071c4bd44 100644
--- a/java/com/android/dialer/dialpadview/res/values/styles.xml
+++ b/java/com/android/dialer/dialpadview/res/values/styles.xml
@@ -82,43 +82,8 @@
     <item name="android:orientation">vertical</item>
   </style>
 
-  <style name="Dialpad">
-    <item name="dialpad_digits_adjustable_height">@dimen/dialpad_digits_height</item>
-    <item name="dialpad_digits_adjustable_text_size">@dimen/dialpad_digits_text_size</item>
-    <item name="dialpad_key_letters_size_for_dual_alphabets">
-      @dimen/dialpad_key_letters_default_size_for_dual_alphabets
-    </item>
-    <item name="dialpad_key_letters_size_for_single_alphabet">
-      @dimen/dialpad_key_letters_default_size_for_single_alphabet
-    </item>
-    <item name="dialpad_key_numbers_size">@dimen/dialpad_key_numbers_default_size</item>
-    <item name="dialpad_key_number_margin_bottom">
-      @dimen/dialpad_key_number_default_margin_bottom
-    </item>
-    <item name="dialpad_end_key_spacing">@dimen/dialpad_bottom_space_height</item>
-    <item name="dialpad_elevation">0dp</item>
-  </style>
-
-  <style name="Dialpad.Light">
-    <item name="dialpad_text_color">@color/dialpad_digits_text_color</item>
-    <item name="dialpad_text_color_primary">@color/dialpad_primary_text_color</item>
-    <item name="dialpad_text_color_secondary">@color/dialpad_secondary_text_color</item>
-    <item name="dialpad_icon_tint">@color/dialpad_icon_tint</item>
-    <item name="dialpad_voicemail_tint">@color/dialpad_voicemail_tint</item>
-    <item name="dialpad_background">@color/background_dialpad</item>
-  </style>
-
-  <style name="Dialpad.Dark">
-    <item name="dialpad_text_color">@android:color/white</item>
-    <item name="dialpad_text_color_primary">@android:color/white</item>
-    <item name="dialpad_text_color_secondary">#ffd4d6d7</item>
-    <item name="dialpad_icon_tint">@android:color/white</item>
-    <item name="dialpad_voicemail_tint">?attr/dialpad_text_color_secondary</item>
-    <item name="dialpad_background">#00000000</item>
-  </style>
-
   <style name="DeviceIdBody">
-    <item name="android:textColor">?android:textColorPrimary</item>
+    <item name="android:textColor">?android:attr/textColorPrimary</item>
     <item name="android:textSize">16sp</item>
   </style>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/theme/AndroidManifest.xml b/java/com/android/dialer/dialpadview/theme/AndroidManifest.xml
new file mode 100644
index 000000000..f0726d0a7
--- /dev/null
+++ b/java/com/android/dialer/dialpadview/theme/AndroidManifest.xml
@@ -0,0 +1,16 @@
+<!--
+  ~ Copyright (C) 2018 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.android.dialer.dialpadview.theme"/>
diff --git a/java/com/android/dialer/dialpadview/theme/res/values/attr.xml b/java/com/android/dialer/dialpadview/theme/res/values/attr.xml
new file mode 100644
index 000000000..99707aa1d
--- /dev/null
+++ b/java/com/android/dialer/dialpadview/theme/res/values/attr.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 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
+  -->
+<resources>
+  <attr format="reference" name="dialpad_style"/>
+  <attr format="dimension" name="dialpad_end_key_spacing"/>
+
+  <declare-styleable name="Dialpad">
+    <attr format="color" name="dialpad_key_button_touch_tint"/>
+    <attr format="dimension" name="dialpad_digits_adjustable_text_size"/>
+    <attr format="dimension" name="dialpad_digits_adjustable_height"/>
+    <attr format="dimension" name="dialpad_key_letters_size_for_dual_alphabets"/>
+    <attr format="dimension" name="dialpad_key_letters_size_for_single_alphabet"/>
+    <attr format="dimension" name="dialpad_key_numbers_size"/>
+    <attr format="dimension" name="dialpad_key_number_margin_bottom"/>
+  </declare-styleable>
+
+  <declare-styleable name="Theme.Dialpad">
+    <attr format="color" name="dialpad_text_color"/>
+    <attr format="color" name="dialpad_text_color_primary"/>
+    <attr format="color" name="dialpad_text_color_secondary"/>
+    <attr format="color" name="dialpad_icon_tint"/>
+    <attr format="color" name="dialpad_voicemail_tint"/>
+    <attr format="color" name="dialpad_background"/>
+    <attr format="dimension" name="dialpad_elevation"/>
+  </declare-styleable>
+</resources>
diff --git a/java/com/android/dialer/dialpadview/theme/res/values/dimens.xml b/java/com/android/dialer/dialpadview/theme/res/values/dimens.xml
new file mode 100644
index 000000000..e90ee1c92
--- /dev/null
+++ b/java/com/android/dialer/dialpadview/theme/res/values/dimens.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 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
+  -->
+<resources>
+  <!-- Text dimensions for dialpad keys -->
+  <dimen name="dialpad_key_numbers_default_size">36dp</dimen>
+  <dimen name="dialpad_key_letters_default_size_for_single_alphabet">12sp</dimen>
+  <dimen name="dialpad_key_letters_default_size_for_dual_alphabets">10sp</dimen>
+  <dimen name="dialpad_key_number_default_margin_bottom">3dp</dimen>
+  <dimen name="dialpad_digits_text_size">34sp</dimen>
+  <dimen name="dialpad_digits_height">60dp</dimen>
+  <!-- The bottom space of the dialpad to account for the dial button -->
+  <dimen name="dialpad_bottom_space_height">80dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/dialpadview/theme/res/values/styles.xml b/java/com/android/dialer/dialpadview/theme/res/values/styles.xml
new file mode 100644
index 000000000..408a33dd1
--- /dev/null
+++ b/java/com/android/dialer/dialpadview/theme/res/values/styles.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 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
+  -->
+<resources>
+  <style name="Dialpad">
+    <item name="dialpad_digits_adjustable_height">@dimen/dialpad_digits_height</item>
+    <item name="dialpad_digits_adjustable_text_size">@dimen/dialpad_digits_text_size</item>
+    <item name="dialpad_key_letters_size_for_dual_alphabets">
+      @dimen/dialpad_key_letters_default_size_for_dual_alphabets
+    </item>
+    <item name="dialpad_key_letters_size_for_single_alphabet">
+      @dimen/dialpad_key_letters_default_size_for_single_alphabet
+    </item>
+    <item name="dialpad_key_numbers_size">@dimen/dialpad_key_numbers_default_size</item>
+    <item name="dialpad_key_number_margin_bottom">
+      @dimen/dialpad_key_number_default_margin_bottom
+    </item>
+    <item name="dialpad_end_key_spacing">@dimen/dialpad_bottom_space_height</item>
+    <item name="dialpad_elevation">0dp</item>
+  </style>
+
+  <style name="Dialpad.Light">
+    <item name="dialpad_text_color">?android:attr/textColorSecondary</item>
+    <item name="dialpad_text_color_primary">?android:attr/colorPrimary</item>
+    <item name="dialpad_text_color_secondary">?android:attr/textColorSecondary</item>
+    <item name="dialpad_icon_tint">?colorIcon</item>
+    <item name="dialpad_voicemail_tint">?colorIcon</item>
+    <item name="dialpad_background">?android:attr/colorBackgroundFloating</item>
+  </style>
+
+  <style name="Dialpad.Dark">
+    <item name="dialpad_text_color">@android:color/white</item>
+    <item name="dialpad_text_color_primary">@android:color/white</item>
+    <item name="dialpad_text_color_secondary">#ffd4d6d7</item>
+    <item name="dialpad_icon_tint">@android:color/white</item>
+    <item name="dialpad_background">#00000000</item>
+  </style>
+</resources>
\ No newline at end of file
-- 
cgit v1.2.3