Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e265532f authored by Leon Scroggins's avatar Leon Scroggins
Browse files

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
parent a4437fc9

api/current.xml

+11 −0
Original line number Diff line number Diff line
@@ -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"

core/java/android/webkit/WebTextView.java

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ import java.util.ArrayList; 
     * @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;

    }

core/res/res/values/attrs.xml

+2 −0
Original line number Diff line number Diff line
@@ -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. -->

core/res/res/values/public.xml

+1 −0
Original line number Diff line number Diff line
@@ -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" />

core/res/res/values/styles.xml

+11 −0
Original line number Diff line number Diff line
@@ -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>