summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2013-09-05 02:39:46 +0000
committerJohn Spurlock <jspurlock@google.com>2013-09-05 02:39:46 +0000
commit322d77185d6e8fe79642f27b653bb51677873cba (patch)
tree6d35171a4f7bb5cc020b2f6314db5e9418ec9047 /core/java
parent5e777f668526104e7dd97d3972d35eb7b9eef5a2 (diff)
downloadframeworks_base-322d77185d6e8fe79642f27b653bb51677873cba.zip
frameworks_base-322d77185d6e8fe79642f27b653bb51677873cba.tar.gz
frameworks_base-322d77185d6e8fe79642f27b653bb51677873cba.tar.bz2
Revert "Re-@hide activity-level FLAG_IMMERSIVE and helpers."
This reverts commit 5e777f668526104e7dd97d3972d35eb7b9eef5a2. Change-Id: I6dc00f376cbbe34dafde3470d8e06c9123f81d8d
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/app/Activity.java4
-rw-r--r--core/java/android/content/pm/ActivityInfo.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index c209b7e..e02410a 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 4f8a48c..8154bca 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}