From 3674b1c21532c07cf0eb39c07edba90f39362e2c Mon Sep 17 00:00:00 2001
From: "James.cf Lin" <jamescflin@google.com>
Date: Thu, 24 Feb 2022 16:05:50 +0800
Subject: [PATCH] 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 255581f0972f83f88e839b1b9ac286f3dd7fc82f)
---
 core/api/current.txt           | 4 ++--
 core/res/res/values/public.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index 2cbc536edbbfa..51247d18045f3 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -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
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index aed1b0d04c8bd..80664eb296af2 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -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">