diff options
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 d7bbab6..8ff5beb 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; /** * Current version under development. diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 4207d70..c17a5ea 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -1671,6 +1671,35 @@ <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 added in version 14 of the platform (Ice Cream Sandwich) |