Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Re-@hide activity-level FLAG_IMMERSIVE and helpers."" into klp-dev

Browse Source
This commit is contained in:
John Spurlock
2013-09-05 02:44:28 +00:00
committed by Android (Google) Code Review
parent adade10a51 322d77185d
commit eebf6895fd
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/current.txt
View File

@@ -2773,6 +2773,7 @@ package android.app {
method public final boolean isChild(); method public final boolean isChild();
method public boolean isDestroyed(); method public boolean isDestroyed();
method public boolean isFinishing(); method public boolean isFinishing();
method public boolean isImmersive();
method public boolean isTaskRoot(); 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 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); method public boolean moveTaskToBack(boolean);
@@ -2862,6 +2863,7 @@ package android.app {
method public final void setFeatureDrawableResource(int, int); method public final void setFeatureDrawableResource(int, int);
method public final void setFeatureDrawableUri(int, android.net.Uri); method public final void setFeatureDrawableUri(int, android.net.Uri);
method public void setFinishOnTouchOutside(boolean); method public void setFinishOnTouchOutside(boolean);
method public void setImmersive(boolean);
method public void setIntent(android.content.Intent); method public void setIntent(android.content.Intent);
method public final void setProgress(int); method public final void setProgress(int);
method public final void setProgressBarIndeterminate(boolean); 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_CLOSE_SYSTEM_DIALOGS = 256; // 0x100
field public static final int FLAG_FINISH_ON_TASK_LAUNCH = 2; // 0x2 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_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_MULTIPROCESS = 1; // 0x1
field public static final int FLAG_NO_HISTORY = 128; // 0x80 field public static final int FLAG_NO_HISTORY = 128; // 0x80
field public static final int FLAG_SINGLE_USER = 1073741824; // 0x40000000 field public static final int FLAG_SINGLE_USER = 1073741824; // 0x40000000

4
core/java/android/app/Activity.java
View File

@@ -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. * interrupted by notifications if possible.
* *
* This value is initially set by the manifest property * 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 * Note that changing this value will have no effect on the activity's
* {@link android.content.pm.ActivityInfo} structure; that is, if * {@link android.content.pm.ActivityInfo} structure; that is, if

2
core/java/android/content/pm/ActivityInfo.java
View File

@@ -161,7 +161,7 @@ public class ActivityInfo extends ComponentInfo
*/ */
public static final int FLAG_SHOW_ON_LOCK_SCREEN = 0x0400; 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. * that wishes not to be interrupted by notifications.
* Applications that hide the system notification bar with * Applications that hide the system notification bar with
* {@link android.view.WindowManager.LayoutParams#FLAG_FULLSCREEN} * {@link android.view.WindowManager.LayoutParams#FLAG_FULLSCREEN}