diff options
| author | Dianne Hackborn <hackbod@google.com> | 2013-04-22 19:49:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-22 19:49:24 +0000 |
| commit | 3edf207a922c24df349e6f9ffadb2bdc5b18d3c2 (patch) | |
| tree | 27dcb9b28a5ff4a07d07cb2d228973f8a837d91a /core/res | |
| parent | 9753ef1e7db65a3245c4a3c619b0778fd5e5a2de (diff) | |
| parent | 6c8c2f094ccd8e915345c3d808222722a4ff438a (diff) | |
| download | frameworks_base-3edf207a922c24df349e6f9ffadb2bdc5b18d3c2.zip frameworks_base-3edf207a922c24df349e6f9ffadb2bdc5b18d3c2.tar.gz frameworks_base-3edf207a922c24df349e6f9ffadb2bdc5b18d3c2.tar.bz2 | |
Merge "Assign final resource IDs for JB MR2." into jb-mr2-dev
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/public.xml | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index c150fe0..2d97138 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2029,27 +2029,27 @@ <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 /> - <public type="attr" name="mipMap" /> - <public type="attr" name="mirrorForRtl" /> - <public type="attr" name="windowOverscan" /> - <public type="attr" name="requiredForAllUsers" /> - <public type="attr" name="indicatorStart" /> - <public type="attr" name="indicatorEnd" /> - <public type="attr" name="childIndicatorStart" /> - <public type="attr" name="childIndicatorEnd" /> - <public type="attr" name="restrictedAccountType" /> - <public type="attr" name="requiredAccountType" /> - <public type="attr" name="canRequestTouchExplorationMode" /> - <public type="attr" name="canRequestEnhancedWebAccessibility" /> - <public type="attr" name="canRequestFilterKeyEvents" /> - - <public type="style" name="Theme.Holo.NoActionBar.Overscan" /> - <public type="style" name="Theme.Holo.Light.NoActionBar.Overscan" /> - <public type="style" name="Theme.DeviceDefault.NoActionBar.Overscan" /> - <public type="style" name="Theme.DeviceDefault.Light.NoActionBar.Overscan" /> + <public type="attr" name="mipMap" id="0x010103cd" /> + <public type="attr" name="mirrorForRtl" id="0x010103ce" /> + <public type="attr" name="windowOverscan" id="0x010103cf" /> + <public type="attr" name="requiredForAllUsers" id="0x010103d0" /> + <public type="attr" name="indicatorStart" id="0x010103d1" /> + <public type="attr" name="indicatorEnd" id="0x010103d2" /> + <public type="attr" name="childIndicatorStart" id="0x010103d3" /> + <public type="attr" name="childIndicatorEnd" id="0x010103d4" /> + <public type="attr" name="restrictedAccountType" id="0x010103d5" /> + <public type="attr" name="requiredAccountType" id="0x010103d6" /> + <public type="attr" name="canRequestTouchExplorationMode" id="0x010103d7" /> + <public type="attr" name="canRequestEnhancedWebAccessibility" id="0x010103d8" /> + <public type="attr" name="canRequestFilterKeyEvents" id="0x010103d9" /> + + <public type="style" name="Theme.Holo.NoActionBar.Overscan" id="0x010301dd" /> + <public type="style" name="Theme.Holo.Light.NoActionBar.Overscan" id="0x010301de" /> + <public type="style" name="Theme.DeviceDefault.NoActionBar.Overscan" id="0x010301df" /> + <public type="style" name="Theme.DeviceDefault.Light.NoActionBar.Overscan" id="0x010301e0" /> </resources> |