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

Commit d9a28ec4 authored by Adrian Roos's avatar Adrian Roos
Browse files

API: fixup resource divergence between S and T 

Move edgeEffectType into its own public group block,
such that resources can still be changed in S without
different ids in S and T.

Bug: 178807038
Bug: 73289295
Test: make checkapi
Change-Id: Id7032a0bc1257201c47e92f1a0b9f1fb7d22a204
parent 5c124736

core/api/current.txt

+4 −4
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ package android { 
    field public static final int dropDownWidth = 16843362; // 0x1010262

    field public static final int duplicateParentState = 16842985; // 0x10100e9

    field public static final int duration = 16843160; // 0x1010198

    field public static final int edgeEffectType = 16844323; // 0x1010623

    field public static final int edgeEffectType = 16844352; // 0x1010640

    field public static final int editTextBackground = 16843602; // 0x1010352

    field public static final int editTextColor = 16843601; // 0x1010351

    field public static final int editTextPreferenceStyle = 16842898; // 0x1010092
@@ -723,7 +723,7 @@ package android { 
    field public static final int gwpAsanMode = 16844310; // 0x1010616

    field public static final int hand_hour = 16843011; // 0x1010103

    field public static final int hand_minute = 16843012; // 0x1010104

    field public static final int hand_second = 16844324; // 0x1010624

    field public static final int hand_second = 16844323; // 0x1010623

    field public static final int handle = 16843354; // 0x101025a

    field public static final int handleProfiling = 16842786; // 0x1010022

    field public static final int hapticFeedbackEnabled = 16843358; // 0x101025e
@@ -965,7 +965,7 @@ package android { 
    field public static final int measureWithLargestChild = 16843476; // 0x10102d4

    field public static final int mediaRouteButtonStyle = 16843693; // 0x10103ad

    field public static final int mediaRouteTypes = 16843694; // 0x10103ae

    field public static final int memtagMode = 16844325; // 0x1010625

    field public static final int memtagMode = 16844324; // 0x1010624

    field public static final int menuCategory = 16843230; // 0x10101de

    field public static final int mimeGroup = 16844309; // 0x1010615

    field public static final int mimeType = 16842790; // 0x1010026
@@ -989,7 +989,7 @@ package android { 
    field public static final int multiArch = 16843918; // 0x101048e

    field public static final int multiprocess = 16842771; // 0x1010013

    field public static final int name = 16842755; // 0x1010003

    field public static final int nativeHeapZeroInit = 16844326; // 0x1010626

    field public static final int nativeHeapZeroInit = 16844325; // 0x1010625

    field public static final int navigationBarColor = 16843858; // 0x1010452

    field public static final int navigationBarDividerColor = 16844141; // 0x101056d

    field public static final int navigationContentDescription = 16843969; // 0x10104c1

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ package android { 














  public static final class R.attr {















    field public static final int allowClearUserDataOnFailedRestore = 16844288; // 0x1010600













    field public static final int hotwordDetectionService = 16844327; // 0x1010627













    field public static final int hotwordDetectionService = 16844326; // 0x1010626















    field public static final int isVrOnly = 16844152; // 0x1010578















    field public static final int minExtensionVersion = 16844305; // 0x1010611















    field public static final int requiredSystemPropertyName = 16844133; // 0x1010565

































core/res/res/values/public.xml



+21
−1






























Original line number
Diff line number
Diff line








@@ -3056,7 +3056,6 @@













    <public name="pathAdvancedPattern" />















    <public name="sspAdvancedPattern" />















    <public name="fontProviderSystemFontFamily" />













    <public name="edgeEffectType" />















    <public name="hand_second" />















    <public name="memtagMode" />















    <public name="nativeHeapZeroInit" />










@@ -3125,6 +3124,27 @@













    <!-- id definitions go here -->















  </public-group>





























  <!-- ===============================================================













   Resources added in version T of the platform



























   NOTE: add <public> elements within a <public-group> like so:



























   <public-group type="attr" first-id="0x01010531">













       <public name="exampleAttr1" />













       <public name="exampleAttr2" />













   </public-group>



























   To add a new public-group block, choose an id value that is 1 greater













   than the last of that item above. For example, the last "attr" id













   value above is 0x01010530, so the public-group of attrs below has













   the id value of 0x01010531.













   =============================================================== -->













  <eat-comment />



























  <public-group type="attr" first-id="0x01010640">













    <public name="edgeEffectType" />













  </public-group>





























  <!-- ===============================================================















       DO NOT ADD UN-GROUPED ITEMS HERE