Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3edf207a: Merge "Assign final resource IDs for JB MR2." into jb-mr2-dev

Browse Source 
* commit '3edf207a922c24df349e6f9ffadb2bdc5b18d3c2':
  Assign final resource IDs for JB MR2.
This commit is contained in:
Dianne Hackborn
2013-04-23 03:50:33 -07:00
committed by Android Git Automerger
parent c87dd64092 3edf207a92
commit e89dcf33e1
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/res/res/values/public.xml
View File

@@ -2029,27 +2029,27 @@
<public type="style" name="Widget.DeviceDefault.Light.CheckedTextView" id="0x010301dc" /> <public type="style" name="Widget.DeviceDefault.Light.CheckedTextView" id="0x010301dc" />
<!-- =============================================================== <!-- ===============================================================
Resources added in version 18 of the platform Resources added in version 18 of the platform (Jelly Bean MR2)
=============================================================== --> =============================================================== -->
<eat-comment /> <eat-comment />
<public type="attr" name="mipMap" /> <public type="attr" name="mipMap" id="0x010103cd" />
<public type="attr" name="mirrorForRtl" /> <public type="attr" name="mirrorForRtl" id="0x010103ce" />
<public type="attr" name="windowOverscan" /> <public type="attr" name="windowOverscan" id="0x010103cf" />
<public type="attr" name="requiredForAllUsers" /> <public type="attr" name="requiredForAllUsers" id="0x010103d0" />
<public type="attr" name="indicatorStart" /> <public type="attr" name="indicatorStart" id="0x010103d1" />
<public type="attr" name="indicatorEnd" /> <public type="attr" name="indicatorEnd" id="0x010103d2" />
<public type="attr" name="childIndicatorStart" /> <public type="attr" name="childIndicatorStart" id="0x010103d3" />
<public type="attr" name="childIndicatorEnd" /> <public type="attr" name="childIndicatorEnd" id="0x010103d4" />
<public type="attr" name="restrictedAccountType" /> <public type="attr" name="restrictedAccountType" id="0x010103d5" />
<public type="attr" name="requiredAccountType" /> <public type="attr" name="requiredAccountType" id="0x010103d6" />
<public type="attr" name="canRequestTouchExplorationMode" /> <public type="attr" name="canRequestTouchExplorationMode" id="0x010103d7" />
<public type="attr" name="canRequestEnhancedWebAccessibility" /> <public type="attr" name="canRequestEnhancedWebAccessibility" id="0x010103d8" />
<public type="attr" name="canRequestFilterKeyEvents" /> <public type="attr" name="canRequestFilterKeyEvents" id="0x010103d9" />
<public type="style" name="Theme.Holo.NoActionBar.Overscan" /> <public type="style" name="Theme.Holo.NoActionBar.Overscan" id="0x010301dd" />
<public type="style" name="Theme.Holo.Light.NoActionBar.Overscan" /> <public type="style" name="Theme.Holo.Light.NoActionBar.Overscan" id="0x010301de" />
<public type="style" name="Theme.DeviceDefault.NoActionBar.Overscan" /> <public type="style" name="Theme.DeviceDefault.NoActionBar.Overscan" id="0x010301df" />
<public type="style" name="Theme.DeviceDefault.Light.NoActionBar.Overscan" /> <public type="style" name="Theme.DeviceDefault.Light.NoActionBar.Overscan" id="0x010301e0" />
</resources> </resources>