drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Final (hopefully) API cleanup." into honeycomb

Browse Source
This commit is contained in:
Dianne Hackborn
2011-01-23 14:48:09 -08:00
committed by Android (Google) Code Review
parent d182046ee6 f3e735c2c3
commit b4ca900d13
4 changed files with 315 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

323
api/11.xml
View File

File diff suppressed because it is too large Load Diff

277
api/current.xml
View File

File diff suppressed because it is too large Load Diff

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

@ -1279,7 +1279,7 @@
<public type="style" name="TextAppearance.StatusBar.EventContent.Title" id="0x01030068" /> <public type="style" name="TextAppearance.StatusBar.EventContent.Title" id="0x01030068" />
<!-- =============================================================== <!-- ===============================================================
Resources proposed for Honeycomb. Resources added in version 11 of the platform (Honeycomb / 3.0).
=============================================================== --> =============================================================== -->
<eat-comment /> <eat-comment />
<public type="attr" name="allContactsName" /> <public type="attr" name="allContactsName" />
@ -1428,6 +1428,8 @@
<public type="attr" name="windowCloseOnTouchOutside" /> <public type="attr" name="windowCloseOnTouchOutside" />
<public type="attr" name="datePickerStyle" /> <public type="attr" name="datePickerStyle" />
<public type="attr" name="calendarViewStyle" /> <public type="attr" name="calendarViewStyle" />
<public type="attr" name="textEditSidePasteWindowLayout" />
<public type="attr" name="textEditSideNoPasteWindowLayout" />
<!-- A simple fade-in animation. --> <!-- A simple fade-in animation. -->
<public type="animator" name="fade_in" id="0x010b0000" /> <public type="animator" name="fade_in" id="0x010b0000" />
@ -1498,7 +1500,6 @@
<public type="style" name="Theme.NoTitleBar.OverlayActionModes" /> <public type="style" name="Theme.NoTitleBar.OverlayActionModes" />
<public type="style" name="Theme.Holo" /> <public type="style" name="Theme.Holo" />
<public type="style" name="Theme.Light.Holo" />
<public type="style" name="Theme.Holo.NoActionBar" /> <public type="style" name="Theme.Holo.NoActionBar" />
<public type="style" name="Theme.Holo.NoActionBar.Fullscreen" /> <public type="style" name="Theme.Holo.NoActionBar.Fullscreen" />
<public type="style" name="Theme.Holo.Light" /> <public type="style" name="Theme.Holo.Light" />
@ -1633,8 +1634,6 @@
<public type="style" name="Widget.Holo.Light.CalendarView" /> <public type="style" name="Widget.Holo.Light.CalendarView" />
<public type="style" name="Widget.DatePicker" /> <public type="style" name="Widget.DatePicker" />
<public type="style" name="Widget.Holo.DatePicker" /> <public type="style" name="Widget.Holo.DatePicker" />
<public type="attr" name="textEditSidePasteWindowLayout" />
<public type="attr" name="textEditSideNoPasteWindowLayout" />
<public type="string" name="selectTextMode" /> <public type="string" name="selectTextMode" />

4
core/res/res/values/themes.xml
View File

@ -1271,10 +1271,6 @@
</style> </style>
<!-- Development legacy name; if you're using this, switch. -->
<style name="Theme.Light.Holo" parent="Theme.Holo.Light">
</style>
<!-- Variant of the holographic (dark) theme with no action bar. --> <!-- Variant of the holographic (dark) theme with no action bar. -->
<style name="Theme.Holo.NoActionBar"> <style name="Theme.Holo.NoActionBar">
<item name="android:windowActionBar">false</item> <item name="android:windowActionBar">false</item>