am 2c994982: Merge commit \'469beca0970c2468f35bb25887e701b6305ba652\' into HEAD
* commit '2c994982ceb72058092a86480a06d44319ea39ae':
diff --git a/res/drawable-hdpi/ic_back_arrow.png b/res/drawable-hdpi/ic_back_arrow.png
deleted file mode 100644
index aad4f36..0000000
--- a/res/drawable-hdpi/ic_back_arrow.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_overflow_lt.png b/res/drawable-hdpi/ic_menu_overflow_lt.png
deleted file mode 100644
index 2561b8c..0000000
--- a/res/drawable-hdpi/ic_menu_overflow_lt.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_back_arrow.png b/res/drawable-mdpi/ic_back_arrow.png
deleted file mode 100644
index 56eb887..0000000
--- a/res/drawable-mdpi/ic_back_arrow.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_overflow_lt.png b/res/drawable-mdpi/ic_menu_overflow_lt.png
deleted file mode 100644
index 7dc68c9..0000000
--- a/res/drawable-mdpi/ic_menu_overflow_lt.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_back_arrow.png b/res/drawable-xhdpi/ic_back_arrow.png
deleted file mode 100644
index 9d46e3d..0000000
--- a/res/drawable-xhdpi/ic_back_arrow.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_overflow_lt.png b/res/drawable-xhdpi/ic_menu_overflow_lt.png
deleted file mode 100644
index 95e436c..0000000
--- a/res/drawable-xhdpi/ic_menu_overflow_lt.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_back_arrow.png b/res/drawable-xxhdpi/ic_back_arrow.png
deleted file mode 100644
index 66b6e35..0000000
--- a/res/drawable-xxhdpi/ic_back_arrow.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_menu_overflow_lt.png b/res/drawable-xxhdpi/ic_menu_overflow_lt.png
deleted file mode 100644
index b9f0c3d..0000000
--- a/res/drawable-xxhdpi/ic_menu_overflow_lt.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/actionbar_background.xml b/res/drawable/actionbar_background.xml
deleted file mode 100644
index eabceac..0000000
--- a/res/drawable/actionbar_background.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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 12b3a0b..f0a3e9f 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -36,12 +36,5 @@
<!-- Settings screen should use the same colors as the Dialer -->
<color name="phone_settings_background_color">#f5f5f5</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>
+ <color name="phone_settings_actionbar_color">#e6e6e6</color>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index c3ad5b8..59edb80 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -163,8 +163,6 @@
<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">
@@ -227,27 +225,13 @@
<item name="android:backgroundStacked">@color/people_app_theme_color</item>
</style>
- <!-- 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>
+ <style name="DialtactsActionBarStyle"
+ parent="@android:style/Widget.Holo.Light.ActionBar">
+ <item name="android:background">@color/phone_settings_actionbar_color</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>
