Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 21025 into donut

Browse Source 
* changes:
  The DONUT constant also needs to be updated to the official SDK version.
This commit is contained in:
Android (Google) Code Review
2009-08-12 18:00:16 -07:00
parent fe6e733a01 fe77ec8e08
commit 6550076f6c
4 changed files with 12 additions and 2568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2543
api/current.xml
View File

File diff suppressed because it is too large Load Diff

11
core/java/android/os/Build.java
View File

@@ -120,9 +120,18 @@ public class Build {
* {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} permission to be
* able to modify the contents of the SD card. (Apps targeting
* earlier versions will always request the permission.)
* <li> They must explicitly request the
* {@link android.Manifest.permission#READ_PHONE_STATE} permission to be
* able to be able to retrieve phone state info. (Apps targeting
* earlier versions will always request the permission.)
* <li> They are assumed to support different screen densities and
* sizes. (Apps targeting earlier versions are assumed to only support
* medium density normal size screens unless otherwise indicated).
* They can still explicitly specify screen support either way with the
* supports-screens manifest tag.
* </ul>
*/
public static final int DONUT = CUR_DEVELOPMENT;
public static final int DONUT = 4;
}
/** The type of build, like "user" or "eng". */

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

@@ -577,9 +577,7 @@
backup and restore of the application's settings to external storage. -->
<attr name="backupAgent" format="string" />
<!-- Whether the application allows its data to be backed up at all. This
attribute defaults to 'true': unless the application opts out, the
user will be able to back up its data to desktop storage. -->
<!-- This is not the attribute you are looking for. -->
<attr name="allowBackup" format="boolean" />
<!-- The <code>manifest</code> tag is the root of an

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

@@ -1128,38 +1128,16 @@
<public type="attr" name="autoUrlDetect" />
<public type="attr" name="resizeable" />
<public-padding type="attr" name="donut_resource_pad" end="0x0101029f" />
<public-padding type="id" name="donut_resource_pad" end="0x01020040" />
<public type="style" name="Widget.ProgressBar.Inverse" id="0x0103005b" />
<public type="style" name="Widget.ProgressBar.Large.Inverse" id="0x0103005c" />
<public type="style" name="Widget.ProgressBar.Small.Inverse" id="0x0103005d" />
<public-padding type="style" name="donut_resource_pad" end="0x01030070" />
<public-padding type="string" name="donut_resource_pad" end="0x01040030" />
<public-padding type="dimen" name="donut_resource_pad" end="0x01050010" />
<public-padding type="color" name="donut_resource_pad" end="0x01060030" />
<public-padding type="array" name="donut_resource_pad" end="0x01070010" />
<public type="drawable" name="stat_sys_vp_phone_call" />
<public type="drawable" name="stat_sys_vp_phone_call_on_hold" />
<public-padding type="drawable" name="donut_resource_pad" end="0x010800d0" />
<public-padding type="layout" name="donut_resource_pad" end="0x01090020" />
<public type="anim" name="anticipate_interpolator" />
<public type="anim" name="overshoot_interpolator" />
<public type="anim" name="anticipate_overshoot_interpolator" />
<public type="anim" name="bounce_interpolator" />
<public type="anim" name="linear_interpolator" />
<public-padding type="anim" name="donut_resource_pad" end="0x010a0020" />
<public-padding type="integer" name="donut_resource_pad" end="0x010e0010" />
</resources>