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

Merge "Fix build." into kraken

Browse Source
This commit is contained in:
Dianne Hackborn
2010-04-29 17:59:17 -07:00
committed by Android (Google) Code Review
parent 867ab64714 22ec9ab3b8
commit fefe7a225e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/content/pm/ApplicationInfo.java
View File

@@ -174,7 +174,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
* Value for {@link #flags}: true when the application's window can be * Value for {@link #flags}: true when the application's window can be
* increased in size for larger screens. Corresponds to * increased in size for larger screens. Corresponds to
* {@link android.R.styleable#AndroidManifestSupportsScreens_largeScreens * {@link android.R.styleable#AndroidManifestSupportsScreens_largeScreens
* android:smallScreens}. * android:largeScreens}.
*/ */
public static final int FLAG_SUPPORTS_LARGE_SCREENS = 1<<11; public static final int FLAG_SUPPORTS_LARGE_SCREENS = 1<<11;
@@ -268,7 +268,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
* Value for {@link #flags}: true when the application's window can be * Value for {@link #flags}: true when the application's window can be
* increased in size for extra large screens. Corresponds to * increased in size for extra large screens. Corresponds to
* {@link android.R.styleable#AndroidManifestSupportsScreens_xlargeScreens * {@link android.R.styleable#AndroidManifestSupportsScreens_xlargeScreens
* android:smallScreens}. * android:xlargeScreens}.
*/ */
public static final int FLAG_SUPPORTS_XLARGE_SCREENS = 1<<19; public static final int FLAG_SUPPORTS_XLARGE_SCREENS = 1<<19;

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

@@ -1244,6 +1244,7 @@
=============================================================== --> =============================================================== -->
<public type="attr" name="logo" id="0x010102be" /> <public type="attr" name="logo" id="0x010102be" />
<public type="attr" name="xlargeScreens" id="0x010102bf" />
<public-padding type="attr" name="kraken_resource_pad" end="0x01010300" /> <public-padding type="attr" name="kraken_resource_pad" end="0x01010300" />
<public-padding type="id" name="kraken_resource_pad" end="0x01020040" /> <public-padding type="id" name="kraken_resource_pad" end="0x01020040" />