diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-03-30 17:43:17 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-30 17:43:17 -0700 |
| commit | 53df89c74fb3a31a874ad575467c5d498a53646e (patch) | |
| tree | 1f658318992d224c7a08676562ffe8f812cb2ebe /core | |
| parent | 01b13a11e6492ebba66c496eaefdb008f2638870 (diff) | |
| parent | 2f98f2670828a42ef93fe782b5be82b1dfeba6ce (diff) | |
| download | frameworks_base-53df89c74fb3a31a874ad575467c5d498a53646e.zip frameworks_base-53df89c74fb3a31a874ad575467c5d498a53646e.tar.gz frameworks_base-53df89c74fb3a31a874ad575467c5d498a53646e.tar.bz2 | |
Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/content/res/Configuration.java | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java index 31119d7..72fa07c 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -57,11 +57,30 @@ public final class Configuration implements Parcelable, Comparable<Configuration */ public boolean userSetLocale; + /** Constant for {@link #screenLayout}: bits that encode the size. */ public static final int SCREENLAYOUT_SIZE_MASK = 0x0f; + /** Constant for {@link #screenLayout}: a {@link #SCREENLAYOUT_SIZE_MASK} + * value indicating that no size has been set. */ public static final int SCREENLAYOUT_SIZE_UNDEFINED = 0x00; + /** Constant for {@link #screenLayout}: a {@link #SCREENLAYOUT_SIZE_MASK} + * value indicating the screen is at least approximately 320x426 dp units. + * See <a href="{@docRoot}guide/practices/screens_support.html">Supporting + * Multiple Screens</a> for more information. */ public static final int SCREENLAYOUT_SIZE_SMALL = 0x01; + /** Constant for {@link #screenLayout}: a {@link #SCREENLAYOUT_SIZE_MASK} + * value indicating the screen is at least approximately 320x470 dp units. + * See <a href="{@docRoot}guide/practices/screens_support.html">Supporting + * Multiple Screens</a> for more information. */ public static final int SCREENLAYOUT_SIZE_NORMAL = 0x02; + /** Constant for {@link #screenLayout}: a {@link #SCREENLAYOUT_SIZE_MASK} + * value indicating the screen is at least approximately 480x640 dp units. + * See <a href="{@docRoot}guide/practices/screens_support.html">Supporting + * Multiple Screens</a> for more information. */ public static final int SCREENLAYOUT_SIZE_LARGE = 0x03; + /** Constant for {@link #screenLayout}: a {@link #SCREENLAYOUT_SIZE_MASK} + * value indicating the screen is at least approximately 720x960 dp units. + * See <a href="{@docRoot}guide/practices/screens_support.html">Supporting + * Multiple Screens</a> for more information.*/ public static final int SCREENLAYOUT_SIZE_XLARGE = 0x04; public static final int SCREENLAYOUT_LONG_MASK = 0x30; @@ -88,6 +107,9 @@ public final class Configuration implements Parcelable, Comparable<Configuration * <p>The {@link #SCREENLAYOUT_LONG_MASK} defines whether the screen * is wider/taller than normal. They may be one of * {@link #SCREENLAYOUT_LONG_NO} or {@link #SCREENLAYOUT_LONG_YES}. + * + * <p>See <a href="{@docRoot}guide/practices/screens_support.html">Supporting + * Multiple Screens</a> for more information. */ public int screenLayout; |