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

Commit 747f75dc authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

am 3a0146cd: Merge "New API for "immersive" activity windows." into gingerbread 

Merge commit '3a0146cd' into gingerbread-plus-aosp

* commit '3a0146cd':
  New API for "immersive" activity windows.
parents 04b4f781 3a0146cd

api/current.xml

+10 −0
Original line number Diff line number Diff line
@@ -188146,6 +188146,16 @@ 
 visibility="public"

>

</field>

<field name="FLAG_IMMERSIVE"

 type="int"

 transient="false"

 volatile="false"

 value="8388608"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="FLAG_KEEP_SCREEN_ON"

 type="int"

core/java/android/view/WindowManager.java

+14 −1
Original line number Diff line number Diff line
@@ -583,6 +583,19 @@ public interface WindowManager extends ViewManager { 
         * also been set. */

        public static final int FLAG_DISMISS_KEYGUARD = 0x00400000;



        /** Window flag: This window corresponds to an immersive activity

         * that wishes not to be interrupted with notifications.  In general,

         * applications may simply hide the status bar with {@link

         * FLAG_FULLSCREEN} to suppress most notifications, but will still be

         * interrupted by those with

         * {@link android.app.Notification.fullScreenIntent} set (example: an

         * incoming call).  Setting {@link FLAG_IMMERSIVE} will suppress the

         * full-screen intent and show the status bar briefly for those

         * important notifications instead.  See also

         * {@link android.app.Notification.FLAG_HIGH_PRIORITY}.

         */

        public static final int FLAG_IMMERSIVE = 0x00800000;



        /** Window flag: *sigh* The lock screen wants to continue running its

         * animation while it is fading.  A kind-of hack to allow this.  Maybe

         * in the future we just make this the default behavior.