summaryrefslogtreecommitdiffstats
path: root/api
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 /api
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 'api')
-rw-r--r--api/current.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index f415182..099b1a5 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