Merge "Change UI styles to match dialer settings light M2 theme" am: 4bda91f1d4 am: 084c03053c
am: 3f7c238828
Change-Id: I37fb992be70a7c2525de69f3834cbc5e04f21200
diff --git a/res/values/colors.xml b/res/values/colors.xml
index cc6f727..065515a 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -40,9 +40,9 @@
<color name="phone_settings_actionbar_text_color">#FFFFFF</color>
<!-- Background color of action bars. Ensure this stays in sync with Dialer
actionbar_background_color. -->
- <color name="actionbar_background_color">@color/dialer_theme_color</color>
+ <color name="actionbar_background_color">#fafafa</color>
<!-- Dark variant of the action bar color. Ensure this stays in sync with Dialer version. -->
- <color name="actionbar_background_color_dark">@color/dialer_theme_color_dark</color>
+ <color name="actionbar_background_color_dark">#fafafa</color>
<!-- Color for icons in the actionbar. Ensure this stays in sync with Dialer version. -->
<color name="actionbar_icon_color">#ffffff</color>
@@ -56,4 +56,11 @@
<color name="floating_action_button_touch_tint">#80ffffff</color>
<color name="emergency_shortcut_button_background_color">#40FFFFFF</color>
<color name="emergency_shortcut_confirm_button_background_color">#E25142</color>
+
+ <!-- Color matches dialer settings light M2 theme.-->
+ <color name="dialer_background_color">#fafafa</color>
+ <color name="dialer_divider_color">#d8d8d8</color>
+ <color name="dialer_primary_text_color">#202124</color>
+ <color name="dialer_secondary_text_color">#5f6368</color>
+
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 38241de..23d20fc 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -202,4 +202,13 @@
<!-- The text size for emergency location.-->
<dimen name="emergency_location_text_size">13sp</dimen>
+
+ <!-- The text size for titles in settings page.-->
+ <dimen name="dialer_head1_font_size">18dp</dimen>
+
+ <!-- The text size for items in settings page.-->
+ <dimen name="dialer_primary2_font_size">16dp</dimen>
+
+ <!-- The text size for description in settings page.-->
+ <dimen name="dialer_secondary_font_size">14dp</dimen>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index ea1aeeb..734098f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -159,7 +159,6 @@
<item name="android:actionBarStyle">@style/DialtactsActionBarStyle</item>
<item name="android:actionMenuTextColor">@color/phone_settings_actionbar_text_color</item>
<item name="android:actionOverflowButtonStyle">@style/DialtactsActionBarOverflow</item>
- <item name="android:homeAsUpIndicator">@drawable/ic_back_arrow</item>
<item name="android:windowActionBarOverlay">false</item>
<item name="android:colorPrimaryDark">@color/actionbar_background_color_dark</item>
<!-- Setting text. -->
@@ -169,6 +168,15 @@
</style>
<style name="DialerSettingsLight" parent="SettingsLight">
+ <!-- Action bar.-->
+ <item name="android:tint">@color/dialer_secondary_text_color</item>
+ <item name="android:windowBackground">@color/dialer_background_color</item>
+ <item name="android:actionModeBackground">@color/dialer_background_color</item>
+ <item name="android:windowLightStatusBar">true</item>
+ <!-- Navigation bar.-->
+ <item name="android:navigationBarColor">@color/dialer_background_color</item>
+ <item name="android:navigationBarDividerColor">@color/dialer_divider_color</item>
+ <item name="android:windowLightNavigationBar">true</item>
<item name="android:colorAccent">@color/dialer_theme_color</item>
<item name="android:dialogTheme">@style/DialerAlertDialogTheme</item>
</style>
@@ -248,7 +256,9 @@
<!-- Text in the action bar at the top of the screen. Should be kept in sync with Dialer. -->
<style name="DialtactsActionBarTitleText"
parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title">
- <item name="android:textColor">@color/phone_settings_actionbar_text_color</item>
+ <item name="android:textColor">@color/dialer_primary_text_color</item>
+ <item name="android:textSize">@dimen/dialer_head1_font_size</item>
+ <item name="android:fontFamily">sans-serif-regular</item>
</style>
<!-- Action bar overflow menu icon. -->