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 /api | |
parent | adade10a5186636daaea50e90fddb50c3707d5ed (diff) | |
parent | 322d77185d6e8fe79642f27b653bb51677873cba (diff) | |
download | frameworks_base-eebf6895fde7ef0d87c91d31b3abb36d4a98df66.zip frameworks_base-eebf6895fde7ef0d87c91d31b3abb36d4a98df66.tar.gz frameworks_base-eebf6895fde7ef0d87c91d31b3abb36d4a98df66.tar.bz2 |
Merge "Revert "Re-@hide activity-level FLAG_IMMERSIVE and helpers."" into klp-dev
Diffstat (limited to 'api')
-rw-r--r-- | api/current.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 2d7c9a6..e50d769 100644 --- a/api/current.txt +++ b/api/current.txt @@ -2773,6 +2773,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); @@ -2862,6 +2863,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); @@ -6942,6 +6944,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 |