diff options
Diffstat (limited to 'java/com/android/dialer/theme/base')
4 files changed, 45 insertions, 24 deletions
diff --git a/java/com/android/dialer/theme/base/res/values/attr.xml b/java/com/android/dialer/theme/base/res/values/attr.xml index 41c6225ad..606d161ad 100644 --- a/java/com/android/dialer/theme/base/res/values/attr.xml +++ b/java/com/android/dialer/theme/base/res/values/attr.xml @@ -23,4 +23,14 @@ <attr name="colorTextOnUnthemedDarkBackground" format="color"/> <!-- Used to color icons on dark backgrounds. White in Light Theme. --> <attr name="colorIconOnUnthemedDarkBackground" format="color"/> -</resources>
\ No newline at end of file + <!-- Used to color the background of chat bubbles we send --> + <attr name="colorMobileOriginatingChatBackground" format="color"/> + <!-- Used to color the text in chat bubbles we send --> + <attr name="colorMobileOriginatingChatText" format="color"/> + <!-- Used to color the background of chat bubbles we receive --> + <attr name="colorMobileTerminatingChatBackground" format="color"/> + <!-- Used to color the text in chat bubbles we receive --> + <attr name="colorMobileTerminatingChatText" format="color"/> + <!-- Used to theme ripple effects with the app's primary color. --> + <attr name="colorPrimary20pct" format="color|reference"/> +</resources> diff --git a/java/com/android/dialer/theme/base/res/values/styles_dialer_light.xml b/java/com/android/dialer/theme/base/res/values/styles_dialer_light.xml index cfdee7801..5fecbaee5 100644 --- a/java/com/android/dialer/theme/base/res/values/styles_dialer_light.xml +++ b/java/com/android/dialer/theme/base/res/values/styles_dialer_light.xml @@ -34,7 +34,6 @@ <item name="android:textColorSecondary">@color/settings_text_color_secondary</item> <item name="android:windowBackground">?android:attr/colorBackground</item> <item name="android:colorAccent">?android:attr/colorPrimary</item> - <item name="android:textColorLink">?android:attr/colorPrimary</item> </style> <!-- TODO(a bug): This is only actively used in empty_content_view.xml. Move it there. --> diff --git a/java/com/android/dialer/theme/base/res/values/theme_dialer_dark.xml b/java/com/android/dialer/theme/base/res/values/theme_dialer_dark.xml index e01a3a282..142bb897b 100644 --- a/java/com/android/dialer/theme/base/res/values/theme_dialer_dark.xml +++ b/java/com/android/dialer/theme/base/res/values/theme_dialer_dark.xml @@ -33,24 +33,24 @@ <!-- Activities and Applications should inherit from one of the themes above. --> <style name="Dialer.Dark.ThemeBase"> <!-- These values should be used to color all backgrounds. --> - <item name="android:colorBackground">@color/dialer_dark_background</item> - <item name="android:colorBackgroundFloating">@color/dialer_dark_background_floating</item> + <item name="android:colorBackground">@color/google_grey_900</item> + <item name="android:colorBackgroundFloating">@color/google_grey_800</item> <!-- These values should be used to set text color. --> <!-- swap text colors. --> - <item name="android:textColorPrimary">@color/dialer_primary_text_color_inverse</item> - <item name="android:textColorSecondary">@color/dialer_secondary_text_color_inverse</item> + <item name="android:textColorPrimary">@color/dialer_dark_primary_text_color</item> + <item name="android:textColorSecondary">@color/dialer_dark_secondary_text_color</item> <item name="android:textColorPrimaryInverse">@color/dialer_primary_text_color</item> <item name="android:textColorSecondaryInverse">@color/dialer_secondary_text_color</item> - <item name="android:textColorHint">@color/dialer_text_hint_color</item> + <item name="android:textColorHint">@color/google_grey_600</item> <!-- These will be automatically used to color most Appcompat/Material widgets. --> - <item name="android:colorPrimary">@color/dialer_theme_color</item> - <item name="colorPrimary">@color/dialer_theme_color</item> - <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item> - <item name="colorPrimaryDark">@color/dialer_theme_color_dark</item> - <item name="android:colorAccent">@color/dialer_secondary_color</item> - <item name="colorAccent">@color/dialer_secondary_color</item> + <item name="android:colorPrimary">@color/dialer_dark_theme_color</item> + <item name="colorPrimary">@color/dialer_dark_theme_color</item> + <item name="android:colorPrimaryDark">@color/dialer_dark_theme_color_dark</item> + <item name="colorPrimaryDark">@color/dialer_dark_theme_color_dark</item> + <item name="android:colorAccent">@color/dialer_dark_secondary_color</item> + <item name="colorAccent">@color/dialer_dark_secondary_color</item> <!-- Used to automatically style check/selected checkbox, switches and radio buttons --> <item name="colorControlActivated">?android:attr/colorPrimary</item> @@ -58,7 +58,8 @@ <!-- Dialer specific attributes. --> <item name="colorIcon">?android:attr/textColorSecondary</item> <item name="colorIconSecondary">?android:attr/textColorSecondary</item> - <item name="colorTextOnUnthemedDarkBackground">@color/dialer_primary_text_color_inverse</item> - <item name="colorIconOnUnthemedDarkBackground">@color/dialer_icon_color_white</item> + <item name="colorTextOnUnthemedDarkBackground">@android:color/white</item> + <item name="colorIconOnUnthemedDarkBackground">@android:color/white</item> + <item name="colorPrimary20pct">@color/dialer_dark_theme_color_20pct</item> </style> </resources>
\ No newline at end of file diff --git a/java/com/android/dialer/theme/base/res/values/theme_dialer_light.xml b/java/com/android/dialer/theme/base/res/values/theme_dialer_light.xml index 667b9726d..c9d4d48f4 100644 --- a/java/com/android/dialer/theme/base/res/values/theme_dialer_light.xml +++ b/java/com/android/dialer/theme/base/res/values/theme_dialer_light.xml @@ -21,6 +21,12 @@ <!-- These are used to style all actionbars in Dialer. These aren't needed in Dialer.ThemeBase.NoActionBar --> <item name="actionBarStyle">@style/DialerActionBarBaseStyle</item> <item name="actionBarSize">@dimen/action_bar_height</item> + + <!-- Pulled from Theme.AppCompat.Light.DarkActionbar--> + <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item> + <item name="actionBarWidgetTheme">@null</item> + <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item> + <item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_dark</item> </style> <style name="Dialer.ThemeBase.NoActionBar"> @@ -33,15 +39,15 @@ <!-- Activities and Applications should inherit from one of the themes above. --> <style name="Dialer.ThemeBase"> <!-- These values should be used to color all backgrounds. --> - <item name="android:colorBackground">@color/dialer_background_light</item> - <item name="android:colorBackgroundFloating">@color/dialer_background_floating_light</item> + <item name="android:colorBackground">#FAFAFA</item> + <item name="android:colorBackgroundFloating">@android:color/white</item> <!-- These values should be used to set text color. --> <item name="android:textColorPrimary">@color/dialer_primary_text_color</item> <item name="android:textColorSecondary">@color/dialer_secondary_text_color</item> - <item name="android:textColorPrimaryInverse">@color/dialer_primary_text_color_inverse</item> - <item name="android:textColorSecondaryInverse">@color/dialer_secondary_text_color_inverse</item> - <item name="android:textColorHint">@color/dialer_text_hint_color</item> + <item name="android:textColorPrimaryInverse">@color/google_grey_300</item> + <item name="android:textColorSecondaryInverse">@color/google_grey_400</item> + <item name="android:textColorHint">@color/google_grey_600</item> <!-- These will be automatically used to color most Appcompat/Material widgets. --> <item name="android:colorPrimary">@color/dialer_theme_color</item> @@ -55,10 +61,15 @@ <item name="colorControlActivated">?android:attr/colorPrimary</item> <!-- Dialer specific attributes. --> - <item name="colorIcon">@color/dialer_secondary_text_color</item> - <item name="colorIconSecondary">@color/dialer_icon_color_secondary</item> - <item name="colorTextOnUnthemedDarkBackground">@color/dialer_primary_text_color_inverse</item> - <item name="colorIconOnUnthemedDarkBackground">@color/dialer_icon_color_white</item> + <item name="colorIcon">@color/google_grey_700</item> + <item name="colorIconSecondary">@color/google_grey_400</item> + <item name="colorTextOnUnthemedDarkBackground">@android:color/white</item> + <item name="colorIconOnUnthemedDarkBackground">@android:color/white</item> + <item name="colorMobileTerminatingChatText">@color/google_blue_100</item> + <item name="colorMobileTerminatingChatBackground">@color/google_blue_900</item> + <item name="colorMobileOriginatingChatText">@color/google_grey_900</item> + <item name="colorMobileOriginatingChatBackground">@color/google_grey_100</item> + <item name="colorPrimary20pct">@color/dialer_theme_color_20pct</item> </style> <!-- TODO(a bug): investigate making this style's parent Dialer.ThemeBase.NoActionBar --> |