diff options
| author | Christopher Tate <ctate@google.com> | 2012-12-11 16:13:51 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-11 16:13:51 -0800 |
| commit | 1de623939090993d03a7c398d09e2d13950d682b (patch) | |
| tree | 12dc222d55bfc246146d8e0bc6eb3bab4799d326 /core/java | |
| parent | 8f276515ea7204f54c773c29eb14a9346f2fa973 (diff) | |
| parent | 534de491e6522465a7ad12d7cba9b2f80deab364 (diff) | |
| download | frameworks_base-1de623939090993d03a7c398d09e2d13950d682b.zip frameworks_base-1de623939090993d03a7c398d09e2d13950d682b.tar.gz frameworks_base-1de623939090993d03a7c398d09e2d13950d682b.tar.bz2 | |
am 534de491: Merge "Make immersive mode public & imply update locking" into jb-mr1-aah-dev
* commit '534de491e6522465a7ad12d7cba9b2f80deab364':
Make immersive mode public & imply update locking
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/Activity.java | 7 | ||||
| -rw-r--r-- | core/java/android/content/pm/ActivityInfo.java | 10 |
2 files changed, 11 insertions, 6 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index f6b9a8e..cbeffc1 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -4818,8 +4818,8 @@ public class Activity extends ContextThemeWrapper * <code>android:immersive</code> but may be changed at runtime by * {@link #setImmersive}. * + * @see #setImmersive(boolean) * @see android.content.pm.ActivityInfo#FLAG_IMMERSIVE - * @hide */ public boolean isImmersive() { try { @@ -4831,7 +4831,7 @@ public class Activity extends ContextThemeWrapper /** * Adjust the current immersive mode setting. - * + * * Note that changing this value will have no effect on the activity's * {@link android.content.pm.ActivityInfo} structure; that is, if * <code>android:immersive</code> is set to <code>true</code> @@ -4840,9 +4840,8 @@ public class Activity extends ContextThemeWrapper * always have its {@link android.content.pm.ActivityInfo#FLAG_IMMERSIVE * FLAG_IMMERSIVE} bit set. * - * @see #isImmersive + * @see #isImmersive() * @see android.content.pm.ActivityInfo#FLAG_IMMERSIVE - * @hide */ public void setImmersive(boolean i) { try { diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java index e2ca1dd..8f3b62d 100644 --- a/core/java/android/content/pm/ActivityInfo.java +++ b/core/java/android/content/pm/ActivityInfo.java @@ -161,7 +161,6 @@ public class ActivityInfo extends ComponentInfo */ public static final int FLAG_SHOW_ON_LOCK_SCREEN = 0x0400; /** - * @hide * Bit in {@link #flags} corresponding to an immersive activity * that wishes not to be interrupted by notifications. * Applications that hide the system notification bar with @@ -174,7 +173,14 @@ public class ActivityInfo extends ComponentInfo * {@link #FLAG_IMMERSIVE} set, however, will not be interrupted; the * notification may be shown in some other way (such as a small floating * "toast" window). - * {@see android.app.Notification#FLAG_HIGH_PRIORITY} + * + * Note that this flag will always reflect the Activity's + * <code>android:immersive</code> manifest definition, even if the Activity's + * immersive state is changed at runtime via + * {@link android.app.Activity#setImmersive(boolean)}. + * + * @see android.app.Notification#FLAG_HIGH_PRIORITY + * @see android.app.Activity#setImmersive(boolean) */ public static final int FLAG_IMMERSIVE = 0x0800; /** |