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

Commit ccee782c authored by Suchi Amalapurapu's avatar Suchi Amalapurapu Committed by The Android Open Source Project
Browse files

am d1a93373: Add a new window flag to display a window when keyguard is shown. 

Merge commit 'd1a93373'

* commit 'd1a93373':
  Add a new window flag to display a window when keyguard is shown.
parents e9e95e6f d1a93373

core/java/android/view/WindowManager.java

+9 −0
Original line number Diff line number Diff line
@@ -466,6 +466,15 @@ public interface WindowManager extends ViewManager { 
         */

        public static final int FLAG_WATCH_OUTSIDE_TOUCH = 0x00040000;

        

        /** Window flag: special flag to let windows be shown when the screen

         * is locked. This will let application windows take precedence over

         * key guard or any other lock screens. Can be used with

         * {@link #FLAG_KEEP_SCREEN_ON} to turn screen on and display windows

         * directly before showing the key guard window

         *

         * {@hide} */

        public static final int FLAG_SHOW_WHEN_LOCKED = 0x00080000;



        /** Window flag: a special option intended for system dialogs.  When

         * this flag is set, the window will demand focus unconditionally when

         * it is created.

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

+0 −3
Original line number Diff line number Diff line
@@ -1307,7 +1307,6 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo 
                    mKeyWaiter.handleNewWindowLocked(mCurrentFocus);

                }

            }

            

            if (localLOGV) Log.v(

                TAG, "New client " + client.asBinder()

                + ": window=" + win);
@@ -7767,7 +7766,6 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo 
        int i;



        // FIRST LOOP: Perform a layout, if needed.

        

        performLayoutLockedInner();

        

        if (mFxSession == null) {
@@ -7787,7 +7785,6 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo 
        }



        // SECOND LOOP: Execute animations and update visibility of windows.

        

        boolean orientationChangeComplete = true;

        Session holdScreen = null;

        float screenBrightness = -1;