diff options
Diffstat (limited to 'java/com/android/incallui/theme/res')
-rw-r--r-- | java/com/android/incallui/theme/res/values/colors.xml | 3 | ||||
-rw-r--r-- | java/com/android/incallui/theme/res/values/styles.xml | 11 |
2 files changed, 6 insertions, 8 deletions
diff --git a/java/com/android/incallui/theme/res/values/colors.xml b/java/com/android/incallui/theme/res/values/colors.xml index cb894bbb7..059fe59a9 100644 --- a/java/com/android/incallui/theme/res/values/colors.xml +++ b/java/com/android/incallui/theme/res/values/colors.xml @@ -25,9 +25,6 @@ <!-- Background color for status bar. For portrait this will be ignored. --> <color name="statusbar_background_color">?android:attr/colorPrimary</color> - <!-- 20% opacity, theme color. --> - <color name="incall_dialpad_touch_tint">@color/dialer_theme_color_20pct</color> - <!-- Background colors for InCallUI. This is a set of colors which pass WCAG AA and all have a contrast ratio over 5:1. diff --git a/java/com/android/incallui/theme/res/values/styles.xml b/java/com/android/incallui/theme/res/values/styles.xml index 3475e3548..e6d6b07b7 100644 --- a/java/com/android/incallui/theme/res/values/styles.xml +++ b/java/com/android/incallui/theme/res/values/styles.xml @@ -25,7 +25,7 @@ <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_key_button_touch_tint">?attr/colorPrimary20pct</item> <item name="dialpad_style">@style/InCallDialpad</item> <item name="android:windowAnimationStyle">@null</item> @@ -34,11 +34,14 @@ </style> <style name="Theme.InCallScreen" parent="@style/Dialer.Dark.ThemeBase.NoActionBar"> + <item name="android:textColorPrimary">@android:color/white</item> <item name="android:statusBarColor">@android:color/transparent</item> <item name="android:navigationBarColor">@android:color/transparent</item> <item name="android:windowDrawsSystemBarBackgrounds">true</item> + <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item> + <item name="colorPrimaryDark">@color/dialer_theme_color_dark</item> - <item name="dialpad_key_button_touch_tint">@color/incall_dialpad_touch_tint</item> + <item name="dialpad_key_button_touch_tint">?attr/colorPrimary20pct</item> <item name="dialpad_style">@style/InCallDialpad</item> <item name="android:windowAnimationStyle">@null</item> @@ -49,7 +52,7 @@ <style name="Theme.InCallScreen.ManageConference" parent="Dialer.ThemeBase.ActionBar"> </style> - <style name="InCallDialpad" parent="Dialpad.Light"> + <style name="InCallDialpad" parent="Dialpad.Themed"> <item name="dialpad_key_number_margin_bottom"> @dimen/incall_dialpad_key_number_margin_bottom </item> @@ -72,8 +75,6 @@ @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> <style name="AfterCallNotificationTheme" parent="Dialer.ThemeBase.NoActionBar"> |