summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeon Scroggins <scroggo@google.com>2010-12-13 13:24:41 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-12-13 13:24:42 -0800
commita60f00ffec251a13544973f43bf10df2b3e90011 (patch)
treefa8b33c5301223fe0200febf27c73bf76df706d1
parentdd60ee728d9e44a8c85ed6a99bcfa44beb0afa23 (diff)
parent60344deb7cc3de88b2f2da1f58d93b86e5ed2eab (diff)
downloadframeworks_base-a60f00ffec251a13544973f43bf10df2b3e90011.zip
frameworks_base-a60f00ffec251a13544973f43bf10df2b3e90011.tar.gz
frameworks_base-a60f00ffec251a13544973f43bf10df2b3e90011.tar.bz2
Merge "Use black text on white background for dropdowns."
-rw-r--r--core/java/android/webkit/WebTextView.java2
-rw-r--r--core/res/res/layout/web_text_view_dropdown.xml26
2 files changed, 27 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebTextView.java b/core/java/android/webkit/WebTextView.java
index 18a0bda..d83fc42 100644
--- a/core/java/android/webkit/WebTextView.java
+++ b/core/java/android/webkit/WebTextView.java
@@ -848,7 +848,7 @@ import junit.framework.Assert;
public AutoCompleteAdapter(Context context, ArrayList<String> entries) {
super(context, com.android.internal.R.layout
- .search_dropdown_item_1line, entries);
+ .web_text_view_dropdown, entries);
}
/**
diff --git a/core/res/res/layout/web_text_view_dropdown.xml b/core/res/res/layout/web_text_view_dropdown.xml
new file mode 100644
index 0000000..1dce5cb
--- /dev/null
+++ b/core/res/res/layout/web_text_view_dropdown.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 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.
+
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@android:id/text1"
+ style="?android:attr/dropDownItemStyle"
+ android:textAppearance="?android:attr/textAppearanceSearchResultTitle"
+ android:textColor="#ff000000"
+ android:background="#ffffffff"
+ android:singleLine="true"
+ android:layout_width="match_parent"
+ android:layout_height="?android:attr/searchResultListItemHeight" />