summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2013-09-05 02:09:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-05 02:09:29 +0000
commit631228b0249de11b5dad37e7a09a251a5558430a (patch)
tree44fa782b6daf841daeaaef143acc142318d4c3ba /api
parenta6fdd7f2eae0d30c36f0eb9f8eac53d3b64b6827 (diff)
parent5e777f668526104e7dd97d3972d35eb7b9eef5a2 (diff)
downloadframeworks_base-631228b0249de11b5dad37e7a09a251a5558430a.zip
frameworks_base-631228b0249de11b5dad37e7a09a251a5558430a.tar.gz
frameworks_base-631228b0249de11b5dad37e7a09a251a5558430a.tar.bz2
Merge "Re-@hide activity-level FLAG_IMMERSIVE and helpers." into klp-dev
Diffstat (limited to 'api')
-rw-r--r--api/current.txt3
1 files changed, 0 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt
index e50d769..2d7c9a6 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -2773,7 +2773,6 @@ 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);
@@ -2863,7 +2862,6 @@ 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);
@@ -6944,7 +6942,6 @@ 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