summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2011-01-15 20:05:21 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-15 20:05:21 -0800
commitc6ac2472c9a24675795df19d2c07cfa86d931dc4 (patch)
tree36d428031f8a5289f93c93a7139944ff40a06e98 /core
parentb921072c2b509cf31d9d9779b30c278bc6f9f640 (diff)
parent674af39e56852ebbe0d792f91daf876fe22f77cb (diff)
downloadframeworks_base-c6ac2472c9a24675795df19d2c07cfa86d931dc4.zip
frameworks_base-c6ac2472c9a24675795df19d2c07cfa86d931dc4.tar.gz
frameworks_base-c6ac2472c9a24675795df19d2c07cfa86d931dc4.tar.bz2
Merge "Fix bug 3238726 - AutoCompleteTextView dropdown text color" into honeycomb
Diffstat (limited to 'core')
-rw-r--r--core/res/res/layout/simple_dropdown_item_1line.xml2
-rw-r--r--core/res/res/layout/simple_dropdown_item_2line.xml4
2 files changed, 3 insertions, 3 deletions
diff --git a/core/res/res/layout/simple_dropdown_item_1line.xml b/core/res/res/layout/simple_dropdown_item_1line.xml
index 18e7b88..3ec930c 100644
--- a/core/res/res/layout/simple_dropdown_item_1line.xml
+++ b/core/res/res/layout/simple_dropdown_item_1line.xml
@@ -20,7 +20,7 @@
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
style="?android:attr/dropDownItemStyle"
- android:textAppearance="?android:attr/textAppearanceLargeInverse"
+ android:textAppearance="?android:attr/textAppearanceLargePopupMenu"
android:singleLine="true"
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
diff --git a/core/res/res/layout/simple_dropdown_item_2line.xml b/core/res/res/layout/simple_dropdown_item_2line.xml
index 903adb0..d6f911a 100644
--- a/core/res/res/layout/simple_dropdown_item_2line.xml
+++ b/core/res/res/layout/simple_dropdown_item_2line.xml
@@ -37,7 +37,7 @@
<TextView
android:id="@android:id/text1"
style="?android:attr/dropDownItemStyle"
- android:textAppearance="?android:attr/textAppearanceLargeInverse"
+ android:textAppearance="?android:attr/textAppearanceLargePopupMenu"
android:singleLine="true"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@@ -45,7 +45,7 @@
<TextView
android:id="@android:id/text2"
style="?android:attr/dropDownItemStyle"
- android:textAppearance="?android:attr/textAppearanceSmallInverse"
+ android:textAppearance="?android:attr/textAppearanceSmallPopupMenu"
android:textColor="#323232"
android:singleLine="true"
android:layout_width="match_parent"