Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1014f337 authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

am 25d81a4c: am eebf6895: Merge "Revert "Re-@hide activity-level... 

am 25d81a4c: am eebf6895: Merge "Revert "Re-@hide activity-level FLAG_IMMERSIVE and helpers."" into klp-dev

* commit '25d81a4c':
  Revert "Re-@hide activity-level FLAG_IMMERSIVE and helpers."
parents ae894e78 25d81a4c

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -2774,6 +2774,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);
@@ -2863,6 +2864,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);
@@ -6956,6 +6958,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

core/java/android/app/Activity.java

+2 −2
Original line number Diff line number Diff line
@@ -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

core/java/android/content/pm/ActivityInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -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}