diff options
| author | Adam Powell <adamp@google.com> | 2011-06-07 18:16:00 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2011-06-07 18:16:00 -0700 |
| commit | 0e9e03f554a3cc7842035d043d50d97ade045382 (patch) | |
| tree | ac84b0930f4e7f469c43b5afa306deccdfab13a4 /core | |
| parent | 2b2c31f603b2dd5a9740e7cf14d926892ec267df (diff) | |
| parent | a7d01a75190abbb4b3f47d15c86421bd19c11fc2 (diff) | |
| download | frameworks_base-0e9e03f554a3cc7842035d043d50d97ade045382.zip frameworks_base-0e9e03f554a3cc7842035d043d50d97ade045382.tar.gz frameworks_base-0e9e03f554a3cc7842035d043d50d97ade045382.tar.bz2 | |
resolved conflicts for merge of a7d01a75 to master
Change-Id: Ib6a7bbca7711cb5e35085868c4b9b5cbb9b526a4
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/res/values/public.xml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index f2bd7cb..55312e3 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -1657,6 +1657,9 @@ <public type="attr" name="compatibleWidthLimitDp" /> <public type="attr" name="largestWidthLimitDp" /> + <public type="style" name="Theme.Holo.Light.NoActionBar" /> + <public type="style" name="Theme.Holo.Light.NoActionBar.Fullscreen" /> + <!-- =============================================================== Resources added in version 13 of the platform (Ice Cream Sandwich) =============================================================== --> @@ -1666,7 +1669,6 @@ <public type="attr" name="state_drag_hovered" /> <public type="attr" name="stopWithTask" /> - <public type="style" name="Theme.Holo.Light.NoActionBar" /> <public type="style" name="TextAppearance.SuggestionHighlight" /> <public type="style" name="Theme.Holo.SplitActionBarWhenNarrow" /> <public type="style" name="Theme.Holo.Light.SplitActionBarWhenNarrow" /> @@ -1704,4 +1706,5 @@ <public type="attr" name="notificationTimeout" /> <public type="attr" name="accessibilityFlags" /> <public type="attr" name="canRetrieveWindowContent" /> + </resources> |