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

Commit 98af636a authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge "Support for triggering the lockscreen while the screen is on:"

parents 391e6269 ef731628

api/current.xml

+13 −2
Original line number Diff line number Diff line
@@ -72273,7 +72273,7 @@ 
 type="float"

 transient="false"

 volatile="false"

 value="0.001f"

 value="0.0010f"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -178552,6 +178552,17 @@ 
 visibility="public"

>

</field>

<field name="FLAG_ALLOW_LOCK_WHILE_SCREEN_ON"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="FLAG_ALT_FOCUSABLE_IM"

 type="int"

 transient="false"
@@ -209795,7 +209806,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="t" type="T">

<parameter name="arg0" type="T">

</parameter>

</method>

</interface>

core/java/android/view/WindowManager.java

+6 −0
Original line number Diff line number Diff line
@@ -369,6 +369,12 @@ public interface WindowManager extends ViewManager { 
         */

        public int flags;

        

        /** Window flag: as long as this window is visible to the user, allow

         *  the lock screen to activate while the screen is on. 

         *  This can be used independently, or in combination with 

         *  {@link #FLAG_KEEP_SCREEN_ON} and/or {@link FLAG_SHOW_WHEN_LOCKED} */

        public static final int FLAG_ALLOW_LOCK_WHILE_SCREEN_ON     = 0x00000001;



        /** Window flag: everything behind this window will be dimmed.

         *  Use {@link #dimAmount} to control the amount of dim. */

        public static final int FLAG_DIM_BEHIND        = 0x00000002;

core/java/android/view/WindowManagerPolicy.java

+6 −0
Original line number Diff line number Diff line
@@ -826,6 +826,12 @@ public interface WindowManagerPolicy { 
     */

    public void systemReady();



    /**

     * Called when userActivity is signalled in the power manager.

     * This is safe to call from any thread, with any window manager locks held or not.

     */

    public void userActivity();



    /**

     * Called when we have finished booting and can now display the home

     * screen to the user.  This wilWl happen after systemReady(), and at

services/java/com/android/server/PowerManagerService.java

+4 −0
Original line number Diff line number Diff line
@@ -2011,6 +2011,10 @@ class PowerManagerService extends IPowerManager.Stub 
                }

            }

        }



        if (mPolicy != null) {

            mPolicy.userActivity();

        }

    }



    private int getAutoBrightnessValue(int sensorValue, int[] values) {

services/java/com/android/server/WindowManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -2385,7 +2385,8 @@ public class WindowManagerService extends IWindowManager.Stub 
                    // to provide the correct semantics while starting.

                    final int mask =

                        WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED

                        | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD;

                        | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD

                        | WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON;

                    WindowManager.LayoutParams sa = win.mAppToken.startingWindow.mAttrs;

                    sa.flags = (sa.flags&~mask) | (win.mAttrs.flags&mask);

                }