Fixed CAB background and selection color for legacy applications.

Also fixed Title/subtitle and menu item button's text colors.

Bug 3378113

Change-Id: Id43cac14dcce40b4f49105e7e524f15b75a6b938

10 files changed, 12 insertions, 35 deletions

diff --git a/core/res/res/drawable-hdpi/cab_background_opaque_holo_dark.9.png b/core/res/res/drawable-hdpi/cab_background_dark.9.png
index bc5db49..bc5db49 100644
--- a/core/res/res/drawable-hdpi/cab_background_opaque_holo_dark.9.png
+++ b/core/res/res/drawable-hdpi/cab_background_dark.9.png
diff --git a/core/res/res/drawable-hdpi/cab_background_opaque_holo_light.9.png b/core/res/res/drawable-hdpi/cab_background_light.9.png
index 1f45bc9..1f45bc9 100644
--- a/core/res/res/drawable-hdpi/cab_background_opaque_holo_light.9.png
+++ b/core/res/res/drawable-hdpi/cab_background_light.9.png
diff --git a/core/res/res/drawable-mdpi/cab_background_opaque_holo_dark.9.png b/core/res/res/drawable-mdpi/cab_background_dark.9.png
index 253b12c..253b12c 100644
--- a/core/res/res/drawable-mdpi/cab_background_opaque_holo_dark.9.png
+++ b/core/res/res/drawable-mdpi/cab_background_dark.9.png
diff --git a/core/res/res/drawable-mdpi/cab_background_opaque_holo_light.9.png b/core/res/res/drawable-mdpi/cab_background_light.9.png
index aaccdfb..aaccdfb 100644
--- a/core/res/res/drawable-mdpi/cab_background_opaque_holo_light.9.png
+++ b/core/res/res/drawable-mdpi/cab_background_light.9.png
diff --git a/core/res/res/drawable/action_bar_context_background.xml b/core/res/res/drawable/action_bar_context_background.xml
deleted file mode 100644
index 8789898..0000000
--- a/core/res/res/drawable/action_bar_context_background.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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.
--->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient
-        android:startColor="#ff000000"
-        android:centerColor="#ffd1d2d4"
-        android:endColor="#ff85878a"
-        android:angle="270" />
-</shape>
diff --git a/core/res/res/layout/action_menu_item_layout.xml b/core/res/res/layout/action_menu_item_layout.xml
index e001894..4477df7 100644
--- a/core/res/res/layout/action_menu_item_layout.xml
+++ b/core/res/res/layout/action_menu_item_layout.xml
@@ -42,6 +42,7 @@
             android:visibility="gone"
             android:textAppearance="?attr/textAppearanceMedium"
             style="?attr/buttonStyleSmall"
+            android:textColor="?attr/textColorPrimary"
             android:background="@null"
             android:paddingLeft="4dip"
             android:paddingRight="4dip" />
diff --git a/core/res/res/layout/search_bar.xml b/core/res/res/layout/search_bar.xml
index ccc6326..9cf08ea 100644
--- a/core/res/res/layout/search_bar.xml
+++ b/core/res/res/layout/search_bar.xml
@@ -25,7 +25,7 @@
     android:layout_height="wrap_content"
     android:orientation="horizontal"
     android:focusable="true"
-    android:background="@drawable/cab_background_opaque_holo_light"
+    android:background="@drawable/cab_background_light"
     android:descendantFocusability="afterDescendants">
 
     <RelativeLayout
diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml
index 1a6f404..ff9ef59 100644
--- a/core/res/res/values/colors.xml
+++ b/core/res/res/values/colors.xml
@@ -56,8 +56,8 @@
     <color name="hint_foreground_light">#808080</color>
     <color name="highlight_background">#cc475925</color>
     <color name="highlight_background_inverse">#ccd2e461</color>
-    <color name="highlighted_text_dark">#cc475925</color>
-    <color name="highlighted_text_light">#ccd2e461</color>
+    <color name="highlighted_text_dark">#9983CC39</color>
+    <color name="highlighted_text_light">#9983CC39</color>
     <color name="link_text_dark">#5c5cff</color>
     <color name="link_text_light">#0000ee</color>
 
diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index 4d7e2ce..0f4924e 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -1065,19 +1065,20 @@
     </style>
 
     <style name="TextAppearance.Widget.ActionBar.Title"
-           parent="@android:style/TextAppearance.Medium.Inverse">
+           parent="@android:style/TextAppearance.Medium">
     </style>
 
     <style name="TextAppearance.Widget.ActionBar.Subtitle"
-           parent="@android:style/TextAppearance.Small.Inverse">
+           parent="@android:style/TextAppearance.Small">
     </style>
 
     <style name="TextAppearance.Widget.ActionMode.Title"
-           parent="@android:style/TextAppearance.Medium.Inverse">
+           parent="@android:style/TextAppearance.Medium">
     </style>
 
     <style name="TextAppearance.Widget.ActionMode.Subtitle"
-           parent="@android:style/TextAppearance.Small.Inverse">
+           parent="@android:style/TextAppearance.Small">
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
 
     <style name="Widget.ActionButton">
@@ -1266,11 +1267,9 @@
     </style>
 
     <style name="TextAppearance.Holo.Widget.ActionMode.Title" parent="TextAppearance.Widget.ActionMode.Title">
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
     <style name="TextAppearance.Holo.Widget.ActionMode.Subtitle" parent="TextAppearance.Widget.ActionMode.Subtitle">
-        <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
 
     <style name="TextAppearance.Holo.Widget.Switch" parent="TextAppearance.Holo.Small">
@@ -1369,11 +1368,9 @@
     </style>
 
     <style name="TextAppearance.Holo.Light.Widget.ActionMode.Title" parent="TextAppearance.Widget.ActionMode.Title">
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
     <style name="TextAppearance.Holo.Light.Widget.ActionMode.Subtitle" parent="TextAppearance.Widget.ActionMode.Subtitle">
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
     <style name="TextAppearance.Holo.Light.WindowTitle">
diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml
index e6e23aa..9d8408d 100644
--- a/core/res/res/values/themes.xml
+++ b/core/res/res/values/themes.xml
@@ -251,7 +251,7 @@
         <item name="actionDropDownStyle">@android:style/Widget.Spinner.DropDown</item>
         <item name="actionButtonStyle">@android:style/Widget.ActionButton</item>
         <item name="actionOverflowButtonStyle">@android:style/Widget.ActionButton.Overflow</item>
-        <item name="actionModeBackground">@android:drawable/action_bar_context_background</item>
+        <item name="actionModeBackground">@android:drawable/cab_background_dark</item>
         <item name="actionModeCloseDrawable">@android:drawable/ic_menu_close_clear_cancel</item>
         <item name="actionModeCutDrawable">@android:drawable/ic_menu_cut_dark</item>
         <item name="actionModeCopyDrawable">@android:drawable/ic_menu_copy_dark</item>
@@ -374,6 +374,8 @@
         <item name="actionModeCutDrawable">@android:drawable/ic_menu_cut_light</item>
         <item name="actionModeCopyDrawable">@android:drawable/ic_menu_copy_light</item>
         <item name="actionModePasteDrawable">@android:drawable/ic_menu_paste_light</item>
+        <item name="actionModeBackground">@android:drawable/cab_background_light</item>
+
         <!-- SearchView attributes -->
         <item name="searchDropdownBackground">@android:drawable/search_dropdown_light</item>
         <item name="searchViewCloseIcon">@android:drawable/ic_clear_holo_light</item>