diff options
| author | Eric Erfanian <erfanian@google.com> | 2018-07-10 18:37:03 +0000 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2018-07-10 18:57:16 +0000 |
| commit | 4ca9e8da3d5c1469e9b203874c9c4e7d4db3eb92 (patch) | |
| tree | 60e6eaeb91e67bc404a39b8353538347efc72a3e /java/com/android/incallui/theme/res/values/styles.xml | |
| parent | 3fb83d37061d26cf48ca41d83f889e4afb7c9699 (diff) | |
Revert "UI refresh for ringing screen."
This reverts commit 36d5b93da4f93e50deb496daa5ad820c48aa7b01.
Change-Id: I533bc3f7d592a6e257d184f0d3730b4be95f2af2
Diffstat (limited to 'java/com/android/incallui/theme/res/values/styles.xml')
| -rw-r--r-- | java/com/android/incallui/theme/res/values/styles.xml | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/java/com/android/incallui/theme/res/values/styles.xml b/java/com/android/incallui/theme/res/values/styles.xml index ac66ffd37..3266c7da3 100644 --- a/java/com/android/incallui/theme/res/values/styles.xml +++ b/java/com/android/incallui/theme/res/values/styles.xml @@ -16,7 +16,11 @@ --> <resources> - <style name="Theme.InCallScreen" parent="@style/Dialer.ThemeBase.NoActionBar"> + <!-- 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"> <item name="android:statusBarColor">@android:color/transparent</item> <item name="android:navigationBarColor">@android:color/transparent</item> <item name="android:windowDrawsSystemBarBackgrounds">true</item> @@ -25,7 +29,25 @@ <item name="dialpad_style">@style/InCallDialpad</item> <item name="android:windowAnimationStyle">@null</item> - <item name="android:windowBackground">?android:attr/colorBackground</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:windowLayoutInDisplayCutoutMode">never</item> </style> |