Modified call settings styles to ensure actionbar coloring is consistent with the Dialer app. This required copying over some shared style information and icons from the Dialer.
Bug: 13364992
Change-Id: Ia64eb46cd9a224773a744d9a719cfcf94cc59d4c
diff --git a/res/drawable-hdpi/ic_back_arrow.png b/res/drawable-hdpi/ic_back_arrow.png
new file mode 100644
index 0000000..aad4f36
--- /dev/null
+++ b/res/drawable-hdpi/ic_back_arrow.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_overflow_lt.png b/res/drawable-hdpi/ic_menu_overflow_lt.png
new file mode 100644
index 0000000..2561b8c
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_overflow_lt.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_back_arrow.png b/res/drawable-mdpi/ic_back_arrow.png
new file mode 100644
index 0000000..56eb887
--- /dev/null
+++ b/res/drawable-mdpi/ic_back_arrow.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_overflow_lt.png b/res/drawable-mdpi/ic_menu_overflow_lt.png
new file mode 100644
index 0000000..7dc68c9
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_overflow_lt.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_back_arrow.png b/res/drawable-xhdpi/ic_back_arrow.png
new file mode 100644
index 0000000..9d46e3d
--- /dev/null
+++ b/res/drawable-xhdpi/ic_back_arrow.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_overflow_lt.png b/res/drawable-xhdpi/ic_menu_overflow_lt.png
new file mode 100644
index 0000000..95e436c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_overflow_lt.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_back_arrow.png b/res/drawable-xxhdpi/ic_back_arrow.png
new file mode 100644
index 0000000..66b6e35
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_back_arrow.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_menu_overflow_lt.png b/res/drawable-xxhdpi/ic_menu_overflow_lt.png
new file mode 100644
index 0000000..b9f0c3d
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_overflow_lt.png
Binary files differ
diff --git a/res/drawable/actionbar_background.xml b/res/drawable/actionbar_background.xml
new file mode 100644
index 0000000..eabceac
--- /dev/null
+++ b/res/drawable/actionbar_background.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+ <item>
+ <shape android:shape="rectangle">
+ <solid android:color="@color/actionbar_underline" />
+ </shape>
+ </item>
+ <item android:bottom="2dp">
+ <shape android:shape="rectangle">
+ <solid android:color="@color/actionbar_background_color" />
+ </shape>
+ </item>
+</layer-list>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index f0a3e9f..12b3a0b 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -36,5 +36,12 @@
<!-- Settings screen should use the same colors as the Dialer -->
<color name="phone_settings_background_color">#f5f5f5</color>
- <color name="phone_settings_actionbar_color">#e6e6e6</color>
+ <!-- Action bar text color. Ensure this stays in sync with Dialer actionbar_text_color. -->
+ <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">#3B77E7</color>
+ <!-- Underline color of action bars. Ensure this stays in sync with Dialer
+ actionbar_underline. -->
+ <color name="actionbar_underline">#3265C1</color>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 59edb80..c3ad5b8 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -163,6 +163,8 @@
<style name="SettingsLight" parent="@android:style/Theme.Holo.Light">
<item name="android:windowBackground">@color/phone_settings_background_color</item>
<item name="android:actionBarStyle">@style/DialtactsActionBarStyle</item>
+ <item name="android:actionOverflowButtonStyle">@style/DialtactsActionBarOverflow</item>
+ <item name="android:homeAsUpIndicator">@drawable/ic_back_arrow</item>
</style>
<style name="Empty" parent="@android:style/Theme.Holo">
@@ -225,13 +227,27 @@
<item name="android:backgroundStacked">@color/people_app_theme_color</item>
</style>
- <style name="DialtactsActionBarStyle"
- parent="@android:style/Widget.Holo.Light.ActionBar">
- <item name="android:background">@color/phone_settings_actionbar_color</item>
+ <!-- Style for the call settings action bar. Should be kept in sync with Dialer. -->
+ <style name="DialtactsActionBarStyle" parent="android:Widget.Holo.ActionBar">
+ <item name="android:background">@drawable/actionbar_background</item>
+ <item name="android:backgroundStacked">#ffffff</item>
+ <item name="android:titleTextStyle">@style/DialtactsActionBarTitleText</item>
<!-- Empty icon -->
<item name="android:icon">@android:color/transparent</item>
</style>
+ <!-- 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.Holo.Widget.ActionBar.Title">
+ <item name="android:textColor">@color/phone_settings_actionbar_text_color</item>
+ </style>
+
+ <!-- Action bar overflow menu icon. -->
+ <style name="DialtactsActionBarOverflow"
+ parent="@android:style/Widget.Holo.ActionButton.Overflow">
+ <item name="android:src">@drawable/ic_menu_overflow_lt</item>
+ </style>
+
<style name="SimImportTheme"
parent="@android:style/Theme.Holo.Light.DarkActionBar">
<item name="android:actionBarStyle">@style/ContactsActionBarStyle</item>
