diff options
| author | John Spurlock <jspurlock@google.com> | 2013-09-05 02:44:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-05 02:44:29 +0000 |
| commit | eebf6895fde7ef0d87c91d31b3abb36d4a98df66 (patch) | |
| tree | 24cfbe940723f9fcef54e058338cbd082d4c2fc1 /core/java/android | |
| parent | adade10a5186636daaea50e90fddb50c3707d5ed (diff) | |
| parent | 322d77185d6e8fe79642f27b653bb51677873cba (diff) | |
Merge "Revert "Re-@hide activity-level FLAG_IMMERSIVE and helpers."" into klp-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/Activity.java | 4 | ||||
| -rw-r--r-- | core/java/android/content/pm/ActivityInfo.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index c209b7e61de8..e02410ac55bf 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -4870,7 +4870,7 @@ public class Activity extends ContextThemeWrapper } /** - * @hide Bit indicating that this activity is "immersive" and should not be + * Bit indicating that this activity is "immersive" and should not be * interrupted by notifications if possible. * * This value is initially set by the manifest property @@ -4953,7 +4953,7 @@ public class Activity extends ContextThemeWrapper } /** - * @hide Adjust the current immersive mode setting. + * 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 diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java index 4f8a48c3c477..8154bca2cb89 100644 --- a/core/java/android/content/pm/ActivityInfo.java +++ b/core/java/android/content/pm/ActivityInfo.java @@ -161,7 +161,7 @@ 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 + * 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 * {@link android.view.WindowManager.LayoutParams#FLAG_FULLSCREEN} |