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

Commit 3674b1c2 authored by James.cf Lin's avatar James.cf Lin Committed by Winson Chiu
Browse files

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

The two attributes LineBreakStyle and LineBreakWordStyle were added in the version S-V2 section in the public.xml file. Move two attributes to the version T section in the public.xml file.

This violates resource finalization, but is done in an attempt to
reconcile differences between master and tm-dev.

Bug: 221172449
Test: atest TextViewTest; atest MeasuredTextTest; atest PrecomputedTextTest; atest TextViewPrecomputedTextTest
Merged-In: Iac54580c3a0a26bd4107342803b5e2eaff011f9c
Change-Id: Iac54580c3a0a26bd4107342803b5e2eaff011f9c
(cherry picked from commit 255581f0)
parent c4ab8175

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">