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

Commit 8ad435d1 authored by James Lin's avatar James Lin Committed by Android (Google) Code Review
Browse files

Merge "Move the new added attr LineBreakStyle to the version T section."

parents f6d99a69 255581f0

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -979,8 +979,8 @@ package android { 
    field public static final int left = 16843181; // 0x10101ad

    field public static final int letterSpacing = 16843958; // 0x10104b6

    field public static final int level = 16844032; // 0x1010500

    field public static final int lineBreakStyle = 16844365; // 0x101064d

    field public static final int lineBreakWordStyle = 16844366; // 0x101064e

    field public static final int lineBreakStyle;

    field public static final int lineBreakWordStyle;

    field public static final int lineHeight = 16844159; // 0x101057f

    field public static final int lineSpacingExtra = 16843287; // 0x1010217

    field public static final int lineSpacingMultiplier = 16843288; // 0x1010218

core/res/res/values/public.xml

+2 −2
Original line number Diff line number Diff line
@@ -3211,8 +3211,6 @@ 
  </staging-public-group-final>



  <public type="attr" name="shouldUseDefaultUnfoldTransition" id="0x0101064c" />

  <public type="attr" name="lineBreakStyle" id="0x0101064d" />

  <public type="attr" name="lineBreakWordStyle" id="0x0101064e" />



  <staging-public-group-final type="id" first-id="0x01fe0000">

    <public name="accessibilityActionDragStart" />
@@ -3281,6 +3279,8 @@ 
    <public name="intro" />

    <public name="enableOnBackInvokedCallback" />

    <public name="supportsInlineSuggestionsWithTouchExploration" />

    <public name="lineBreakStyle" />

    <public name="lineBreakWordStyle" />

  </staging-public-group>



  <staging-public-group type="id" first-id="0x01de0000">