Create a default style for WebTextView.
As a result, all apps using WebView (and therefore WebTextView)
will get the same style, and display properly.
Fixes http://b/issue?id=2385422
diff --git a/api/current.xml b/api/current.xml
index 00f7505..e5177efa 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -9073,6 +9073,17 @@
visibility="public"
>
</field>
+<field name="webTextViewStyle"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843450"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
<field name="webViewStyle"
type="int"
transient="false"
diff --git a/core/java/android/webkit/WebTextView.java b/core/java/android/webkit/WebTextView.java
index 9e9cc7e..d1ad61f 100644
--- a/core/java/android/webkit/WebTextView.java
+++ b/core/java/android/webkit/WebTextView.java
@@ -116,7 +116,7 @@
* @param webView The WebView that created this.
*/
/* package */ WebTextView(Context context, WebView webView) {
- super(context);
+ super(context, null, com.android.internal.R.attr.webTextViewStyle);
mWebView = webView;
mMaxLength = -1;
}
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index ff8cdc9..0f6a5c1 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -396,6 +396,8 @@
<attr name="tabWidgetStyle" format="reference" />
<!-- Default TextView style. -->
<attr name="textViewStyle" format="reference" />
+ <!-- Default WebTextView style. -->
+ <attr name="webTextViewStyle" format="reference" />
<!-- Default WebView style. -->
<attr name="webViewStyle" format="reference" />
<!-- Default style for drop down items. -->
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 3c6338e..aca220f 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -1230,6 +1230,7 @@
<public type="attr" name="neverEncrypt" id="0x010102b7" />
<public type="attr" name="installLocation" id="0x010102b8" />
<public type="attr" name="safeMode" id="0x010102b9" />
+ <public type="attr" name="webTextViewStyle" id="0x010102ba" />
<public type="anim" name="cycle_interpolator" id="0x010a000c" />
diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index 58e9f45..1287669 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -503,6 +503,17 @@
<item name="android:scrollbars">horizontal|vertical</item>
</style>
+ <style name="Widget.WebTextView">
+ <item name="android:focusable">true</item>
+ <item name="android:focusableInTouchMode">true</item>
+ <item name="android:clickable">true</item>
+ <item name="android:completionHintView">@android:layout/simple_dropdown_item_1line</item>
+ <item name="android:textAppearance">?android:attr/textAppearanceLargeInverse</item>
+ <item name="android:completionThreshold">2</item>
+ <item name="android:dropDownSelector">@android:drawable/list_selector_background</item>
+ <item name="android:popupBackground">@android:drawable/spinner_dropdown_background</item>
+ </style>
+
<style name="Widget.TabWidget">
<item name="android:textAppearance">@style/TextAppearance.Widget.TabWidget</item>
<item name="ellipsize">marquee</item>
diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml
index d7a3be3..9e19c57 100644
--- a/core/res/res/values/themes.xml
+++ b/core/res/res/values/themes.xml
@@ -170,6 +170,7 @@
<item name="starStyle">@android:style/Widget.CompoundButton.Star</item>
<item name="tabWidgetStyle">@android:style/Widget.TabWidget</item>
<item name="textViewStyle">@android:style/Widget.TextView</item>
+ <item name="webTextViewStyle">@android:style/Widget.WebTextView</item>
<item name="webViewStyle">@android:style/Widget.WebView</item>
<item name="dropDownItemStyle">@android:style/Widget.DropDownItem</item>
<item name="spinnerDropDownItemStyle">@android:style/Widget.DropDownItem.Spinner</item>