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

Commit 748a3779 authored by Raph Levien's avatar Raph Levien Committed by Android Git Automerger
Browse files

am 455b351b: Merge "Make elegantTextHeight xml attribute public" into lmp-preview-dev 

* commit '455b351bba515c3a7e6139368c4110abbf1e4e89':
  Make elegantTextHeight xml attribute public
parents 86414c31 5b29e12c

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -492,6 +492,7 @@ package android { 
    field public static final int editTextStyle = 16842862; // 0x101006e

    field public static final deprecated int editable = 16843115; // 0x101016b

    field public static final int editorExtras = 16843300; // 0x1010224

    field public static final int elegantTextHeight = 16843867; // 0x101045b

    field public static final int elevation = 16843843; // 0x1010443

    field public static final int ellipsize = 16842923; // 0x10100ab

    field public static final int ems = 16843096; // 0x1010158

core/java/android/widget/TextView.java

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

 * @attr ref android.R.styleable#TextView_imeActionId

 * @attr ref android.R.styleable#TextView_editorExtras

 * @attr ref android.R.styleable#TextView_elegantTextHeight

 */

@RemoteView

public class TextView extends View implements ViewTreeObserver.OnPreDrawListener {
@@ -2637,6 +2638,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
     * metrics, and also increases top and bottom bounds to provide more space.

     *

     * @param elegant set the paint's elegant metrics flag.

     *

     * @attr ref android.R.styleable#TextView_elegantTextHeight

     */

    public void setElegantTextHeight(boolean elegant) {

        mTextPaint.setElegantTextHeight(elegant);

core/res/res/values/public.xml

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

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

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

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



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