Merge "Icon displays abnormally about FDN in the phone process"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index be3e2b8..679eba6 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -44,7 +44,7 @@
<!-- Dark variant of the action bar color. Ensure this stays in sync with Dialer version. -->
<color name="actionbar_background_color_dark">#ffffff</color>
<!-- Color for icons in the actionbar. Ensure this stays in sync with Dialer version. -->
- <color name="actionbar_icon_color">#ffffff</color>
+ <color name="actionbar_icon_color">#5f6368</color>
<!-- Color for the setting text. -->
<color name="setting_primary_color">#333333</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index f2db63d..a4a349c 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -169,7 +169,6 @@
<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>
@@ -179,6 +178,7 @@
<item name="android:windowLightNavigationBar">true</item>
<item name="android:colorAccent">@color/dialer_theme_color</item>
<item name="android:dialogTheme">@style/DialerAlertDialogTheme</item>
+ <item name="android:homeAsUpIndicator">@drawable/ic_back_arrow</item>
</style>
<style name="DialerAlertDialogTheme"