Revert "Re-@hide activity-level FLAG_IMMERSIVE and helpers."

This reverts commit 5e777f668526104e7dd97d3972d35eb7b9eef5a2.

Change-Id: I6dc00f376cbbe34dafde3470d8e06c9123f81d8d

3 files changed, 6 insertions, 3 deletions

diff --git a/api/current.txt b/api/current.txt
index f41518274d2b..099b1a57ba76 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -2771,6 +2771,7 @@ package android.app {
     method public final boolean isChild();
     method public boolean isDestroyed();
     method public boolean isFinishing();
+    method public boolean isImmersive();
     method public boolean isTaskRoot();
     method public final deprecated android.database.Cursor managedQuery(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String);
     method public boolean moveTaskToBack(boolean);
@@ -2860,6 +2861,7 @@ package android.app {
     method public final void setFeatureDrawableResource(int, int);
     method public final void setFeatureDrawableUri(int, android.net.Uri);
     method public void setFinishOnTouchOutside(boolean);
+    method public void setImmersive(boolean);
     method public void setIntent(android.content.Intent);
     method public final void setProgress(int);
     method public final void setProgressBarIndeterminate(boolean);
@@ -6993,6 +6995,7 @@ package android.content.pm {
     field public static final int FLAG_FINISH_ON_CLOSE_SYSTEM_DIALOGS = 256; // 0x100
     field public static final int FLAG_FINISH_ON_TASK_LAUNCH = 2; // 0x2
     field public static final int FLAG_HARDWARE_ACCELERATED = 512; // 0x200
+    field public static final int FLAG_IMMERSIVE = 2048; // 0x800
     field public static final int FLAG_MULTIPROCESS = 1; // 0x1
     field public static final int FLAG_NO_HISTORY = 128; // 0x80
     field public static final int FLAG_SINGLE_USER = 1073741824; // 0x40000000
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}