summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adam Lesinski <adamlesinski@google.com> 2017-10-04 14:02:24 -0700
committer Adam Lesinski <adamlesinski@google.com> 2017-10-04 14:02:24 -0700
commitaa39aa6a19fbeaaca4fd530c23ada1a4e5dfbdbb (patch)
tree214826fcfdce9cda142c706605abba23774af9ac
parent65e91ce6c3aac8e350cbf5e1de2d2b13c78d792b (diff)
Finalize resource IDs for O-MR1
Bug: 65543844 Test: manual Change-Id: Ic1fd1278373a5f7486e214d3f7f4c13515edb9f9
-rw-r--r--core/res/res/values/public.xml34
1 files changed, 18 insertions, 16 deletions
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index e9d574afef8d..108ac1cab44e 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2842,23 +2842,13 @@
=============================================================== -->
<eat-comment />
- <public-group type="attr" first-id="0x01010569">
- <public name="showWhenLocked"/>
- <public name="turnScreenOn"/>
- <public name="classLoader" />
- <public name="windowLightNavigationBar" />
- <public name="navigationBarDividerColor" />
- </public-group>
+ <public type="attr" name="showWhenLocked" id="0x01010569" />
+ <public type="attr" name="turnScreenOn" id="0x0101056a" />
+ <public type="attr" name="classLoader" id="0x0101056b" />
+ <public type="attr" name="windowLightNavigationBar" id="0x0101056c" />
+ <public type="attr" name="navigationBarDividerColor" id="0x0101056d" />
- <public-group type="style" first-id="0x010302e0">
- </public-group>
-
- <public-group type="id" first-id="0x01020044">
- </public-group>
-
- <public-group type="string" first-id="0x0104001a">
- <public name="autofill"/>
- </public-group>
+ <public type="string" name="autofill" id="0x0104001a"/>
<!-- ===============================================================
Resources added in version P of the platform
@@ -2877,6 +2867,18 @@
=============================================================== -->
<eat-comment />
+ <public-group type="attr" first-id="0x0101056e">
+ </public-group>
+
+ <public-group type="style" first-id="0x010302e0">
+ </public-group>
+
+ <public-group type="id" first-id="0x01020044">
+ </public-group>
+
+ <public-group type="string" first-id="0x0104001b">
+ </public-group>
+
<!-- ===============================================================
DO NOT ADD UN-GROUPED ITEMS HERE