diff options
Diffstat (limited to 'java/com/android/incallui/theme/res/values')
-rw-r--r-- | java/com/android/incallui/theme/res/values/colors.xml | 12 | ||||
-rw-r--r-- | java/com/android/incallui/theme/res/values/styles.xml | 26 |
2 files changed, 2 insertions, 36 deletions
diff --git a/java/com/android/incallui/theme/res/values/colors.xml b/java/com/android/incallui/theme/res/values/colors.xml index 059fe59a9..10a19ef50 100644 --- a/java/com/android/incallui/theme/res/values/colors.xml +++ b/java/com/android/incallui/theme/res/values/colors.xml @@ -52,16 +52,4 @@ <item>#B93221</item> <item>#841F10</item> </array> - - <color name="incall_background_gradient_top">#E91141BB</color> - <color name="incall_background_gradient_middle">#E91141BB</color> - <color name="incall_background_gradient_bottom">#CC229FEB</color> - - <color name="incall_background_multiwindow">#E91141BB</color> - - <color name="incall_background_gradient_spam_top">#E5A30B0B</color> - <color name="incall_background_gradient_spam_middle">#D6C01111</color> - <color name="incall_background_gradient_spam_bottom">#B8E55135</color> - - <color name="incall_background_multiwindow_spam">#E9C22E2E</color> </resources> diff --git a/java/com/android/incallui/theme/res/values/styles.xml b/java/com/android/incallui/theme/res/values/styles.xml index 3266c7da3..ac66ffd37 100644 --- a/java/com/android/incallui/theme/res/values/styles.xml +++ b/java/com/android/incallui/theme/res/values/styles.xml @@ -16,11 +16,7 @@ --> <resources> - <!-- Theme for the InCallActivity activity. Should have a transparent background for the - 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"> + <style name="Theme.InCallScreen" 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> @@ -29,25 +25,7 @@ <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:textColorPrimary">@android:color/white</item> - <item name="android:textColorSecondary">#DDFFFFFF</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">?attr/colorPrimary20pct</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> + <item name="android:windowBackground">?android:attr/colorBackground</item> <item name="android:windowLayoutInDisplayCutoutMode">never</item> </style> |