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

Commit 2f39e3f0 authored by Yurii Zubrytskyi's avatar Yurii Zubrytskyi
Browse files

Manual merge of sc-v2 resource finalization 

Bug: 204295952
Bug: 203782582
Test: manual, aapt2 dump on the generated resources

(source change id: I507f85737d0ba5bf074dd8d98633087ff33c8382)

Change-Id: I15fc4b2fb14d9eed439c60721230b402f95cffd8
parent 30afad00

core/api/current.txt

+4 −4
Original line number Diff line number Diff line
@@ -1308,7 +1308,7 @@ package android { 
    field public static final int shortcutLongLabel = 16844074; // 0x101052a

    field public static final int shortcutShortLabel = 16844073; // 0x1010529

    field public static final int shouldDisableView = 16843246; // 0x10101ee

    field public static final int shouldUseDefaultUnfoldTransition;

    field public static final int shouldUseDefaultUnfoldTransition = 16844364; // 0x101064c

    field public static final int showAsAction = 16843481; // 0x10102d9

    field public static final int showDefault = 16843258; // 0x10101fa

    field public static final int showDividers = 16843561; // 0x1010329
@@ -2026,9 +2026,9 @@ package android { 
  public static final class R.id {

    ctor public R.id();

    field public static final int accessibilityActionContextClick = 16908348; // 0x102003c

    field public static final int accessibilityActionDragCancel;

    field public static final int accessibilityActionDragDrop;

    field public static final int accessibilityActionDragStart;

    field public static final int accessibilityActionDragCancel = 16908375; // 0x1020057

    field public static final int accessibilityActionDragDrop = 16908374; // 0x1020056

    field public static final int accessibilityActionDragStart = 16908373; // 0x1020055

    field public static final int accessibilityActionHideTooltip = 16908357; // 0x1020045

    field public static final int accessibilityActionImeEnter = 16908372; // 0x1020054

    field public static final int accessibilityActionMoveWindow = 16908354; // 0x1020042

core/res/res/values/public.xml

+9 −66
Original line number Diff line number Diff line
@@ -3203,81 +3203,24 @@ 


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

    Resources added in version S-V2 of the platform



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



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

        <public name="exampleAttr1" />

        <public name="exampleAttr2" />

    </staging-public-group>



    To add a new <staging-public-group> block, find the id value for the

    last <staging-public-group> block defined for thie API level, and

    subtract 0x00010000 from it to get to the id of the new block.



    For example, if the block closest to the end of this file has an id

    of 0x01ee0000, the id of the new block should be 0x01ed0000

    (0x01ee0000 - 0x00010000 = 0x01ed0000).

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

  <eat-comment />



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

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

    <public name="shouldUseDefaultUnfoldTransition" />

  </staging-public-group>

  </staging-public-group-final>



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



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

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

    <public name="accessibilityActionDragStart" />

    <public name="accessibilityActionDragDrop" />

    <public name="accessibilityActionDragCancel" />

  </staging-public-group>



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

  </staging-public-group>



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

  </staging-public-group>



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

  </staging-public-group>

  </staging-public-group-final>



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

  </staging-public-group>



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

  </staging-public-group>



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

  </staging-public-group>



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

  </staging-public-group>



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

  </staging-public-group>



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

  </staging-public-group>



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

  </staging-public-group>



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

  </staging-public-group>



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

  </staging-public-group>



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

  </staging-public-group>



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

  </staging-public-group>



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

  </staging-public-group>



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

  </staging-public-group>

  <public type="id" name="accessibilityActionDragStart" id="0x01020055" />

  <public type="id" name="accessibilityActionDragDrop" id="0x01020056" />

  <public type="id" name="accessibilityActionDragCancel" id="0x01020057" />



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

    Resources added in version T of the platform