Merge "Add <staging-public-group> tags to T" am: 423e45e117 am: fcbe66c5cf

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956978

Change-Id: Id40de1c593f0241617831621840a344ab674075f
This commit is contained in:
Aaron Huang
2022-01-25 06:03:03 +00:00
committed by Automerger Merge Worker

View File

@@ -3200,11 +3200,85 @@
<!-- @hide For use by platform and tools only. Developers should not specify this value. -->
<public type="string" name="config_defaultRingtoneVibrationSound" id="0x0104003b" />
<!-- ===============================================================
Resources added in version T 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="0x01df0000">
</staging-public-group>
<staging-public-group type="id" first-id="0x01de0000">
</staging-public-group>
<staging-public-group type="style" first-id="0x0dfd0000">
</staging-public-group>
<staging-public-group type="string" first-id="0x0dfc0000">
</staging-public-group>
<staging-public-group type="dimen" first-id="0x01db0000">
</staging-public-group>
<staging-public-group type="color" first-id="0x01da0000">
</staging-public-group>
<staging-public-group type="array" first-id="0x01d90000">
</staging-public-group>
<staging-public-group type="drawable" first-id="0x01d80000">
</staging-public-group>
<staging-public-group type="layout" first-id="0x01d70000">
</staging-public-group>
<staging-public-group type="anim" first-id="0x01d60000">
</staging-public-group>
<staging-public-group type="animator" first-id="0x01d50000">
</staging-public-group>
<staging-public-group type="interpolator" first-id="0x01d40000">
</staging-public-group>
<staging-public-group type="mipmap" first-id="0x01d30000">
</staging-public-group>
<staging-public-group type="integer" first-id="0x01d20000">
</staging-public-group>
<staging-public-group type="transition" first-id="0x01d10000">
</staging-public-group>
<staging-public-group type="raw" first-id="0x01d00000">
</staging-public-group>
<staging-public-group type="bool" first-id="0x01cf0000">
</staging-public-group>
<staging-public-group type="fraction" first-id="0x01ce0000">
</staging-public-group>
<!-- ===============================================================
DO NOT ADD UN-GROUPED ITEMS HERE
Any new items (attrs, styles, ids, etc.) *must* be added in a
public-group block, as the preceding comment explains.
staging-public-group block, as the preceding comment explains.
Items added outside of a group may have their value recalculated
every time something new is added to this file.
=============================================================== -->