diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-06-09 16:02:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-09 16:02:02 -0700 |
| commit | a8d7ea067cf22baeee2ff0a33e5a8c5a35936942 (patch) | |
| tree | 9f4f48ddce8c838c2807c49712c7ae3aaea050b7 /core | |
| parent | 75749ab1a03f5b4a9f1aaee64dd1c6f36e22dc22 (diff) | |
| parent | 220cd77de62956eb76c5084e1d1341d69bfd214a (diff) | |
| download | frameworks_base-a8d7ea067cf22baeee2ff0a33e5a8c5a35936942.zip frameworks_base-a8d7ea067cf22baeee2ff0a33e5a8c5a35936942.tar.gz frameworks_base-a8d7ea067cf22baeee2ff0a33e5a8c5a35936942.tar.bz2 | |
am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2
* commit '220cd77de62956eb76c5084e1d1341d69bfd214a':
Enforce public resource restriction on bag parents.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/os/Build.java | 4 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 29 |
2 files changed, 31 insertions, 2 deletions
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index 3c91d64..6257e95 100644 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -232,7 +232,7 @@ public class Build { public static final int HONEYCOMB_MR1 = 12; /** - * Current development version. + * June 2011: Android 3.2. * * <p>Update to Honeycomb MR1 to support 7 inch tablets, improve * screen compatibility mode, etc.</p> @@ -244,7 +244,7 @@ public class Build { * large as the current screen will provide the user with a UI to * switch them in to screen size compatibility mode.</p> */ - public static final int HONEYCOMB_MR2 = CUR_DEVELOPMENT; + public static final int HONEYCOMB_MR2 = 13; } /** The type of build, like "user" or "eng". */ diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index db5f39f..dfa33a6 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -1670,5 +1670,34 @@ <public type="style" name="Widget.Holo.Light.ActionBar.TabView" /> <public type="style" name="Widget.Holo.Light.ActionBar.TabText" /> <public type="style" name="Widget.Holo.Light.ActionBar.TabBar" /> + <public type="style" name="TextAppearance.Holo" /> + <public type="style" name="TextAppearance.Holo.Inverse" /> + <public type="style" name="TextAppearance.Holo.Large" /> + <public type="style" name="TextAppearance.Holo.Large.Inverse" /> + <public type="style" name="TextAppearance.Holo.Medium" /> + <public type="style" name="TextAppearance.Holo.Medium.Inverse" /> + <public type="style" name="TextAppearance.Holo.Small" /> + <public type="style" name="TextAppearance.Holo.Small.Inverse" /> + <public type="style" name="TextAppearance.Holo.SearchResult.Title" /> + <public type="style" name="TextAppearance.Holo.SearchResult.Subtitle" /> + <public type="style" name="TextAppearance.Holo.Widget" /> + <public type="style" name="TextAppearance.Holo.Widget.Button" /> + <public type="style" name="TextAppearance.Holo.Widget.IconMenu.Item" /> + <public type="style" name="TextAppearance.Holo.Widget.TabWidget" /> + <public type="style" name="TextAppearance.Holo.Widget.TextView" /> + <public type="style" name="TextAppearance.Holo.Widget.TextView.PopupMenu" /> + <public type="style" name="TextAppearance.Holo.Widget.DropDownHint" /> + <public type="style" name="TextAppearance.Holo.Widget.DropDownItem" /> + <public type="style" name="TextAppearance.Holo.Widget.TextView.SpinnerItem" /> + <public type="style" name="TextAppearance.Holo.Widget.EditText" /> + <public type="style" name="TextAppearance.Holo.Widget.PopupMenu" /> + <public type="style" name="TextAppearance.Holo.Widget.PopupMenu.Large" /> + <public type="style" name="TextAppearance.Holo.Widget.PopupMenu.Small" /> + <public type="style" name="TextAppearance.Holo.Widget.ActionBar.Title" /> + <public type="style" name="TextAppearance.Holo.Widget.ActionBar.Subtitle" /> + <public type="style" name="TextAppearance.Holo.Widget.ActionMode.Title" /> + <public type="style" name="TextAppearance.Holo.Widget.ActionMode.Subtitle" /> + <public type="style" name="TextAppearance.Holo.WindowTitle" /> + <public type="style" name="TextAppearance.Holo.DialogWindowTitle" /> </resources> |