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

Commit 4cf6286c authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e:... 

am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev

* commit '02c7ba73':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
parents 759445c5 02c7ba73

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

+9 −5
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ import java.io.File; 
import java.io.FileReader;

import java.io.IOException;

import java.io.PrintWriter;

import java.util.HashSet;



import static android.view.WindowManager.LayoutParams.*;

import static android.view.WindowManagerPolicy.WindowManagerFuncs.LID_ABSENT;
@@ -383,7 +384,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    static final Rect mTmpNavigationFrame = new Rect();

    

    WindowState mTopFullscreenOpaqueWindowState;

    boolean mHideWindowBehindKeyguard;

    HashSet<IApplicationToken> mAppsToBeHidden = new HashSet<IApplicationToken>();

    boolean mTopIsFullscreen;

    boolean mForceStatusBar;

    boolean mForceStatusBarFromKeyguard;
@@ -3213,7 +3214,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    @Override

    public void beginPostLayoutPolicyLw(int displayWidth, int displayHeight) {

        mTopFullscreenOpaqueWindowState = null;

        mHideWindowBehindKeyguard = false;

        mAppsToBeHidden.clear();

        mForceStatusBar = false;

        mForceStatusBarFromKeyguard = false;

        mForcingShowNavBar = false;
@@ -3265,12 +3266,17 @@ public class PhoneWindowManager implements WindowManagerPolicy { 


            final boolean showWhenLocked = (attrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0;

            if (appWindow) {

                if (showWhenLocked) {

                    mAppsToBeHidden.remove(win.getAppToken());

                } else {

                    mAppsToBeHidden.add(win.getAppToken());

                }

                if (attrs.x == 0 && attrs.y == 0

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

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

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

                    mTopFullscreenOpaqueWindowState = win;

                    if (!mHideWindowBehindKeyguard) {

                    if (mAppsToBeHidden.isEmpty()) {

                        if (showWhenLocked) {

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

                            mHideLockScreen = true;
@@ -3289,8 +3295,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    if ((attrs.flags & FLAG_ALLOW_LOCK_WHILE_SCREEN_ON) != 0) {

                        mAllowLockscreenWhenOn = true;

                    }

                } else if (!showWhenLocked) {

                    mHideWindowBehindKeyguard = true;

                }

            }

        }