From c5c42189eeab0389a94717de9a66c6d00068e8bf Mon Sep 17 00:00:00 2001
From: calderwoodra <calderwoodra@google.com>
Date: Tue, 22 May 2018 15:30:39 -0700
Subject: 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
---
 .../com/android/incallui/incall/impl/res/color/incall_button_icon.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'java/com/android/incallui/incall')

diff --git a/java/com/android/incallui/incall/impl/res/color/incall_button_icon.xml b/java/com/android/incallui/incall/impl/res/color/incall_button_icon.xml
index 8e9120b09..c6ed6e72f 100644
--- a/java/com/android/incallui/incall/impl/res/color/incall_button_icon.xml
+++ b/java/com/android/incallui/incall/impl/res/color/incall_button_icon.xml
@@ -16,6 +16,6 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:color="#FF1C3AA9" android:state_checked="true"/>
-  <item android:color="#FFFFFFFF"/>
+  <item android:color="?android:attr/colorPrimary" android:state_checked="true"/>
+  <item android:color="?android:attr/colorBackgroundFloating"/>
 </selector>
-- 
cgit v1.2.3


From 0fe130fed43cd295d4ef852d52b9dd102350016f Mon Sep 17 00:00:00 2001
From: uabdullah <uabdullah@google.com>
Date: Wed, 23 May 2018 17:54:29 -0700
Subject: Use Dialer Light Theme for SpeakEasyFragment

Bug: 79523664,80195371
Test: Need to add Scuba tests (http://b/80194939)
PiperOrigin-RevId: 197821095
Change-Id: I92ea1e6b95d264ea69f7d30eea12f547ee60eeac
---
 java/com/android/incallui/incall/impl/InCallFragment.java |  1 +
 java/com/android/incallui/theme/res/values/styles.xml     | 13 +++++++++++++
 2 files changed, 14 insertions(+)

(limited to 'java/com/android/incallui/incall')

diff --git a/java/com/android/incallui/incall/impl/InCallFragment.java b/java/com/android/incallui/incall/impl/InCallFragment.java
index 85ae0bbb6..7f20b407f 100644
--- a/java/com/android/incallui/incall/impl/InCallFragment.java
+++ b/java/com/android/incallui/incall/impl/InCallFragment.java
@@ -148,6 +148,7 @@ public class InCallFragment extends Fragment
       @Nullable ViewGroup viewGroup,
       @Nullable Bundle bundle) {
     LogUtil.i("InCallFragment.onCreateView", null);
+    getActivity().setTheme(R.style.Theme_InCallScreen);
     // Bypass to avoid StrictModeResourceMismatchViolation
     final View view =
         StrictModeUtils.bypass(
diff --git a/java/com/android/incallui/theme/res/values/styles.xml b/java/com/android/incallui/theme/res/values/styles.xml
index f396559c8..f4b55c3e6 100644
--- a/java/com/android/incallui/theme/res/values/styles.xml
+++ b/java/com/android/incallui/theme/res/values/styles.xml
@@ -20,6 +20,19 @@
        circular reveal animation for a new outgoing call to work correctly. We don't just use
        Theme.Black.NoTitleBar directly, since we want any popups or dialogs from the
        InCallActivity to have the correct Material style. -->
+  <style name="Theme.InCallScreen.Light" parent="@style/Dialer.ThemeBase.NoActionBar">
+    <item name="android:statusBarColor">@android:color/transparent</item>
+    <item name="android:navigationBarColor">@android:color/transparent</item>
+    <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+
+    <item name="dialpad_key_button_touch_tint">@color/incall_dialpad_touch_tint</item>
+    <item name="dialpad_style">@style/InCallDialpad</item>
+    <item name="android:windowAnimationStyle">@null</item>
+
+    <item name="android:windowBackground">@drawable/incall_background_gradient</item>
+    <item name="android:windowShowWallpaper">true</item>
+  </style>
+
   <style name="Theme.InCallScreen" parent="@style/Dialer.Dark.ThemeBase.NoActionBar">
     <item name="android:statusBarColor">@android:color/transparent</item>
     <item name="android:navigationBarColor">@android:color/transparent</item>
-- 
cgit v1.2.3


From e70ef90dda54b30fb3ed4db35f35f875f4a47500 Mon Sep 17 00:00:00 2001
From: calderwoodra <calderwoodra@google.com>
Date: Thu, 24 May 2018 14:21:14 -0700
Subject: Fix a few UI bugs.

 - clear call log dialog no longer crashes
 - phone account selector dialog now has a visible title
 - dialpad text in the incall ui is now visible.

Bug: 80144855,80146941,80175230
Test: tap
PiperOrigin-RevId: 197952658
Change-Id: Ifaea9b798fef7e36d681a83269e4f65df33f1193
---
 java/com/android/dialer/theme/private/res/values/styles.xml         | 6 +++++-
 .../android/incallui/incall/impl/res/color/incall_button_icon.xml   | 2 +-
 java/com/android/incallui/theme/res/values/styles.xml               | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'java/com/android/incallui/incall')

diff --git a/java/com/android/dialer/theme/private/res/values/styles.xml b/java/com/android/dialer/theme/private/res/values/styles.xml
index 158cd190d..90e452993 100644
--- a/java/com/android/dialer/theme/private/res/values/styles.xml
+++ b/java/com/android/dialer/theme/private/res/values/styles.xml
@@ -26,6 +26,7 @@
 
     <!-- Used to automatically style AlertDialogs -->
     <item name="alertDialogTheme">@style/AlertDialogTheme</item>
+    <item name="android:alertDialogTheme">@style/AlertDialogTheme</item>
   </style>
 
   <style name="Dialer.Dark" parent="Theme.AppCompat">
@@ -38,6 +39,7 @@
 
     <!-- Used to automatically style AlertDialogs -->
     <item name="alertDialogTheme">@style/AlertDialogTheme</item>
+    <item name="android:alertDialogTheme">@style/AlertDialogTheme</item>
   </style>
 
   <!-- Used to style all Dialer's button's text. Every button is awarded this for free if the parent
@@ -49,7 +51,9 @@
   <!-- Used to style all Dialer's AlertDialogs. Every button is awarded this for free if the parent
      activity's theme extends from Dialer.ThemeBase(.NoActionBar) or doesn't specify a theme. -->
   <style name="AlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
+    <item name="android:textColorPrimary">@color/dialer_primary_text_color</item>
     <!-- TODO(a bug): figure out why ?android:attr/colorPrimary doesn't work here -->
+    <item name="android:colorAccent">@color/dialer_theme_color</item>
     <item name="colorAccent">@color/dialer_theme_color</item>
   </style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/java/com/android/incallui/incall/impl/res/color/incall_button_icon.xml b/java/com/android/incallui/incall/impl/res/color/incall_button_icon.xml
index c6ed6e72f..68b34c89d 100644
--- a/java/com/android/incallui/incall/impl/res/color/incall_button_icon.xml
+++ b/java/com/android/incallui/incall/impl/res/color/incall_button_icon.xml
@@ -16,6 +16,6 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:color="?android:attr/colorPrimary" android:state_checked="true"/>
+  <item android:color="?android:attr/colorPrimaryDark" android:state_checked="true"/>
   <item android:color="?android:attr/colorBackgroundFloating"/>
 </selector>
diff --git a/java/com/android/incallui/theme/res/values/styles.xml b/java/com/android/incallui/theme/res/values/styles.xml
index f4b55c3e6..3475e3548 100644
--- a/java/com/android/incallui/theme/res/values/styles.xml
+++ b/java/com/android/incallui/theme/res/values/styles.xml
@@ -72,6 +72,7 @@
       @dimen/incall_end_call_spacing
     </item>
     <item name="dialpad_elevation">10dp</item>
+    <item name="dialpad_text_color">?android:attr/textColorPrimaryInverse</item>
     <item name="dialpad_text_color_secondary">?android:attr/textColorSecondaryInverse</item>
   </style>
 
-- 
cgit v1.2.3