diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-03 13:48:20 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-09-03 15:20:06 -0700 |
| commit | 69717ccd13bb5568b912701ab39d603cfa7091cc (patch) | |
| tree | 867742e28adc250e7260dbf04aba967f50264e0c /core | |
| parent | df3a0f50c3480911e366c8c0781b0463fe063e82 (diff) | |
| download | frameworks_base-69717ccd13bb5568b912701ab39d603cfa7091cc.zip frameworks_base-69717ccd13bb5568b912701ab39d603cfa7091cc.tar.gz frameworks_base-69717ccd13bb5568b912701ab39d603cfa7091cc.tar.bz2 | |
DO NOT MERGE. Some stuff that is Not Ready.
Change-Id: I8fdba32722d86b92c791dbf7c6c0166bcdb02852
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/content/pm/ApplicationInfo.java | 3 | ||||
| -rw-r--r-- | core/java/android/content/res/Configuration.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java index ae6a311..cf24433 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -269,6 +269,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { * increased in size for extra large screens. Corresponds to * {@link android.R.styleable#AndroidManifestSupportsScreens_xlargeScreens * android:xlargeScreens}. + * @hide */ public static final int FLAG_SUPPORTS_XLARGE_SCREENS = 1<<19; @@ -311,7 +312,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { * {@link #FLAG_ALLOW_CLEAR_USER_DATA}, {@link #FLAG_UPDATED_SYSTEM_APP}, * {@link #FLAG_TEST_ONLY}, {@link #FLAG_SUPPORTS_SMALL_SCREENS}, * {@link #FLAG_SUPPORTS_NORMAL_SCREENS}, - * {@link #FLAG_SUPPORTS_LARGE_SCREENS}, {@link #FLAG_SUPPORTS_XLARGE_SCREENS}, + * {@link #FLAG_SUPPORTS_LARGE_SCREENS}, * {@link #FLAG_RESIZEABLE_FOR_SCREENS}, * {@link #FLAG_SUPPORTS_SCREEN_DENSITIES}, {@link #FLAG_VM_SAFE_MODE} */ diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java index 02956ba..5a3dd41 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -62,6 +62,7 @@ public final class Configuration implements Parcelable, Comparable<Configuration public static final int SCREENLAYOUT_SIZE_SMALL = 0x01; public static final int SCREENLAYOUT_SIZE_NORMAL = 0x02; public static final int SCREENLAYOUT_SIZE_LARGE = 0x03; + /** @hide */ public static final int SCREENLAYOUT_SIZE_XLARGE = 0x04; public static final int SCREENLAYOUT_LONG_MASK = 0x30; @@ -83,7 +84,7 @@ public final class Configuration implements Parcelable, Comparable<Configuration * <p>The {@link #SCREENLAYOUT_SIZE_MASK} bits define the overall size * of the screen. They may be one of * {@link #SCREENLAYOUT_SIZE_SMALL}, {@link #SCREENLAYOUT_SIZE_NORMAL}, - * {@link #SCREENLAYOUT_SIZE_LARGE}, or {@link #SCREENLAYOUT_SIZE_XLARGE}. + * {@link #SCREENLAYOUT_SIZE_LARGE}. * * <p>The {@link #SCREENLAYOUT_LONG_MASK} defines whether the screen * is wider/taller than normal. They may be one of |