diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-10-22 14:01:25 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-22 14:01:25 -0700 |
| commit | 38993d8d833ca2e61111d2a828dc4f67ca7848cb (patch) | |
| tree | 51fc80c83becfb740723985b8e87a9e018c921c7 /core/java | |
| parent | 40763914e3c999a88e2c8254317bc1ac7196ed37 (diff) | |
| parent | 5383f502e4479d117c89666fb2ee1ca53f3d27cf (diff) | |
Merge "Fix issue #3122240: Expose xlarge in GB." into gingerbread
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/ActivityManager.java | 8 | ||||
| -rw-r--r-- | core/java/android/content/res/Configuration.java | 1 | ||||
| -rw-r--r-- | core/java/android/os/Build.java | 10 |
3 files changed, 6 insertions, 13 deletions
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 5ae8a1f4941c..fe1e7d7e46cd 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -797,10 +797,12 @@ public class ActivityManager { public static final int IMPORTANCE_PERCEPTIBLE = 130; /** - * Constant for {@link #importance}: this process is running a - * heavy-weight application and thus should not be killed. + * Constant for {@link #importance}: this process is running an + * application that can not save its state, and thus can't be killed + * while in the background. + * @hide */ - public static final int IMPORTANCE_HEAVY_WEIGHT = 170; + public static final int IMPORTANCE_CANT_SAVE_STATE = 170; /** * Constant for {@link #importance}: this process is contains services diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java index 5a3dd415b9fc..ef382361466f 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -62,7 +62,6 @@ 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; diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index 08c14025bded..edd0bd3f8678 100644 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -188,15 +188,7 @@ public class Build { public static final int FROYO = 8; /** - * Next version of Android. - * - * <p>Applications targeting this or a later release will get these - * new changes in behavior:</p> - * <ul> - * <li> The status bar is now dark. Targeting this version allows - * the platform to perform performing compatibility on status bar - * graphics to ensure they look okay on a dark background. - * </ul> + * Newest version of Android, version 2.3. */ public static final int GINGERBREAD = 9; } |