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

Commit 467aa0d7 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

am 52d5ab27: am f7178d3c: Allow the secure keyguard to engage behind Dreams. 

* commit '52d5ab27':
  Allow the secure keyguard to engage behind Dreams.
parents e2a0b87b 52d5ab27

core/java/android/service/dreams/Dream.java

+5 −0
Original line number Diff line number Diff line
@@ -346,6 +346,11 @@ public class Dream extends Service implements Window.Callback { 
        lp.type = WindowManager.LayoutParams.TYPE_DREAM;

        lp.token = windowToken;

        lp.windowAnimations = com.android.internal.R.style.Animation_Dream;

        lp.flags |= ( WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED

                    | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD

                    | WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON 

                    );

        mWindow.setAttributes(lp);

        

        //WindowManagerImpl.getDefault().addView(mWindow.getDecorView(), lp);

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+2 −2
Original line number Diff line number Diff line
@@ -2854,8 +2854,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            if ((attrs.flags & FLAG_FORCE_NOT_FULLSCREEN) != 0) {

                mForceStatusBar = true;

            }

            if (attrs.type >= FIRST_APPLICATION_WINDOW

                    && attrs.type <= LAST_APPLICATION_WINDOW

            if (((attrs.type >= FIRST_APPLICATION_WINDOW && attrs.type <= LAST_APPLICATION_WINDOW)

                        || attrs.type == TYPE_DREAM)

                    && attrs.x == 0 && attrs.y == 0

                    && attrs.width == WindowManager.LayoutParams.MATCH_PARENT

                    && attrs.height == WindowManager.LayoutParams.MATCH_PARENT) {