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

Commit ff89d589 authored by Craig Mautner's avatar Craig Mautner
Browse files

Merge commit '3b9de0a4' into manualmerge 

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

Change-Id: I5433912e9d97a20bec6c8e287450550daab6d89b
parents 51b921d0 3b9de0a4

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

+16 −12
Original line number Diff line number Diff line
@@ -3421,19 +3421,23 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                        && attrs.height == WindowManager.LayoutParams.MATCH_PARENT) {

                    if (DEBUG_LAYOUT) Slog.v(TAG, "Fullscreen window: " + win);

                    mTopFullscreenOpaqueWindowState = win;

                    if (showWhenLocked && !mHideWindowBehindKeyguard) {

                        if (DEBUG_LAYOUT) Slog.v(TAG, "Setting mHideLockScreen to true by win " + win);

                    if (!mHideWindowBehindKeyguard) {

                        if (showWhenLocked) {

                            if (DEBUG_LAYOUT) Slog.v(TAG,

                                    "Setting mHideLockScreen to true by win " + win);

                            mHideLockScreen = true;

                            mForceStatusBarFromKeyguard = false;

                        }

                        if ((attrs.flags & FLAG_DISMISS_KEYGUARD) != 0

                                && mDismissKeyguard == DISMISS_KEYGUARD_NONE) {

                        if (DEBUG_LAYOUT) Slog.v(TAG, "Setting mDismissKeyguard true by win " + win);

                            if (DEBUG_LAYOUT) Slog.v(TAG,

                                    "Setting mDismissKeyguard true by win " + win);

                            mDismissKeyguard = mWinDismissingKeyguard == win ?

                                    DISMISS_KEYGUARD_CONTINUE : DISMISS_KEYGUARD_START;

                            mWinDismissingKeyguard = win;

                            mForceStatusBarFromKeyguard = mShowingLockscreen && isKeyguardSecure();

                        }

                    }

                    if ((attrs.flags & FLAG_ALLOW_LOCK_WHILE_SCREEN_ON) != 0) {

                        mAllowLockscreenWhenOn = true;

                    }