Don't use activatedBackgroundIndicator under API 14
bug:7460473
Change-Id: I5d46302e13dfda04f72128329ecea147913ea8d8
diff --git a/res/drawable-hdpi/list_selector_background_selected.9.png b/res/drawable-hdpi/list_selector_background_selected.9.png
new file mode 100644
index 0000000..cbf50b3
--- /dev/null
+++ b/res/drawable-hdpi/list_selector_background_selected.9.png
Binary files differ
diff --git a/res/drawable-mdpi/list_selector_background_selected.9.png b/res/drawable-mdpi/list_selector_background_selected.9.png
new file mode 100644
index 0000000..a4ac1e3
--- /dev/null
+++ b/res/drawable-mdpi/list_selector_background_selected.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/list_selector_background_selected.9.png b/res/drawable-xhdpi/list_selector_background_selected.9.png
new file mode 100644
index 0000000..78358fe
--- /dev/null
+++ b/res/drawable-xhdpi/list_selector_background_selected.9.png
Binary files differ
diff --git a/res/drawable/action_bar_two_line_background.xml b/res/drawable/action_bar_two_line_background.xml
new file mode 100644
index 0000000..a5a1855
--- /dev/null
+++ b/res/drawable/action_bar_two_line_background.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_activated="true"
+ android:drawable="@drawable/list_selector_background_selected" />
+ <item android:drawable="@android:color/transparent" />
+</selector>
diff --git a/res/layout/action_bar_two_line_text.xml b/res/layout/action_bar_two_line_text.xml
index 95faffa..92a4af9 100644
--- a/res/layout/action_bar_two_line_text.xml
+++ b/res/layout/action_bar_two_line_text.xml
@@ -14,10 +14,10 @@
limitations under the License.
-->
<TwoLineListItem xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/ActionBarTwoLineItem"
android:layout_height="match_parent"
android:orientation="vertical"
android:gravity="center_vertical"
- android:background="?android:attr/activatedBackgroundIndicator"
android:duplicateParentState="false"
android:layout_alignParentLeft="true"
android:layout_width="wrap_content" >
diff --git a/res/values-v14/styles.xml b/res/values-v14/styles.xml
index db89b05..0608330 100644
--- a/res/values-v14/styles.xml
+++ b/res/values-v14/styles.xml
@@ -19,4 +19,7 @@
<item name="listPreferredItemHeightSmall">?android:attr/listPreferredItemHeightSmall</item>
<item name="switchStyle">@android:style/Widget.CompoundButton</item>
</style>
+ <style name="ActionBarTwoLineItem">
+ <item name="android:background">?android:attr/activatedBackgroundIndicator</item>
+ </style>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index e9aebcd..0a2689e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -43,4 +43,7 @@
<color name="darker_transparent">#C1000000</color>
<style name="ActionBarTwoLinePrimary" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title"></style>
<style name="ActionBarTwoLineSecondary" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Subtitle"></style>
+ <style name="ActionBarTwoLineItem">
+ <item name="android:background">@drawable/action_bar_two_line_background</item>
+ </style>
</resources>
