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

Commit 1d97d398 authored by Raph Levien's avatar Raph Levien Committed by Android (Google) Code Review
Browse files

Merge "Fix docs build breakage in #TextView_letterSpacing" into lmp-dev

parents 68bed6c5 40d83df8

core/java/android/widget/TextView.java

+0 −1
Original line number Diff line number Diff line
@@ -222,7 +222,6 @@ import static android.os.Build.VERSION_CODES.JELLY_BEAN_MR1; 
 * @attr ref android.R.styleable#TextView_imeActionId

 * @attr ref android.R.styleable#TextView_editorExtras

 * @attr ref android.R.styleable#TextView_elegantTextHeight

 * @attr ref android.R.styleable#TextView_letterSpacing

 */

@RemoteView

public class TextView extends View implements ViewTreeObserver.OnPreDrawListener {

core/res/res/values/attrs.xml

+2 −2
Original line number Diff line number Diff line
@@ -3755,7 +3755,7 @@ 
        <attr name="shadowRadius" format="float" />

        <!-- Elegant text height, especially for less compacted complex script text. -->

        <attr name="elegantTextHeight" format="boolean" />

        <!-- @hide Text letter-spacing. -->

        <!-- Text letter-spacing. -->

        <attr name="letterSpacing" format="float" />

    </declare-styleable>

    <declare-styleable name="TextClock">
@@ -4050,7 +4050,7 @@ 
        <attr name="textAllCaps" />

        <!-- Elegant text height, especially for less compacted complex script text. -->

        <attr name="elegantTextHeight" />

        <!-- @hide Text letter-spacing. -->

        <!-- Text letter-spacing. -->

        <attr name="letterSpacing" />

    </declare-styleable>

    <declare-styleable name="TextViewAppearance">

core/res/res/values/public.xml

+0 −1
Original line number Diff line number Diff line
@@ -2268,7 +2268,6 @@ 
  <public type="attr" name="checkMarkTintMode" />

  <public type="attr" name="popupTheme" />

  <public type="attr" name="toolbarStyle" />

  <public type="attr" name="letterSpacing" />



  <public-padding type="dimen" name="l_resource_pad" end="0x01050010" />