Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Show the keyguard if unsecure window on top" into klp-modular-dev

Browse Source
This commit is contained in:
Craig Mautner
2014-03-07 01:25:50 +00:00
committed by Android (Google) Code Review
parent da9a956bd8 ab55e524b8
commit f453f3a168
1 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -380,6 +380,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
static final Rect mTmpNavigationFrame = new Rect(); static final Rect mTmpNavigationFrame = new Rect();
WindowState mTopFullscreenOpaqueWindowState; WindowState mTopFullscreenOpaqueWindowState;
boolean mHideWindowBehindKeyguard;
boolean mTopIsFullscreen; boolean mTopIsFullscreen;
boolean mForceStatusBar; boolean mForceStatusBar;
boolean mForceStatusBarFromKeyguard; boolean mForceStatusBarFromKeyguard;
@@ -3364,6 +3365,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
@Override @Override
public void beginPostLayoutPolicyLw(int displayWidth, int displayHeight) { public void beginPostLayoutPolicyLw(int displayWidth, int displayHeight) {
mTopFullscreenOpaqueWindowState = null; mTopFullscreenOpaqueWindowState = null;
mHideWindowBehindKeyguard = false;
mForceStatusBar = false; mForceStatusBar = false;
mForceStatusBarFromKeyguard = false; mForceStatusBarFromKeyguard = false;
mForcingShowNavBar = false; mForcingShowNavBar = false;
@@ -3399,7 +3401,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (attrs.type == TYPE_KEYGUARD) { if (attrs.type == TYPE_KEYGUARD) {
mShowingLockscreen = true; mShowingLockscreen = true;
} }
boolean applyWindow = attrs.type >= FIRST_APPLICATION_WINDOW boolean appWindow = attrs.type >= FIRST_APPLICATION_WINDOW
&& attrs.type <= LAST_APPLICATION_WINDOW; && attrs.type <= LAST_APPLICATION_WINDOW;
if (attrs.type == TYPE_DREAM) { if (attrs.type == TYPE_DREAM) {
// If the lockscreen was showing when the dream started then wait // If the lockscreen was showing when the dream started then wait
@@ -3407,16 +3409,18 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (!mDreamingLockscreen if (!mDreamingLockscreen
|| (win.isVisibleLw() && win.hasDrawnLw())) { || (win.isVisibleLw() && win.hasDrawnLw())) {
mShowingDream = true; mShowingDream = true;
applyWindow = true; appWindow = true;
} }
} }
if (applyWindow
&& attrs.x == 0 && attrs.y == 0 final boolean showWhenLocked = (attrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0;
if (appWindow) {
if (attrs.x == 0 && attrs.y == 0
&& attrs.width == WindowManager.LayoutParams.MATCH_PARENT && attrs.width == WindowManager.LayoutParams.MATCH_PARENT
&& attrs.height == WindowManager.LayoutParams.MATCH_PARENT) { && attrs.height == WindowManager.LayoutParams.MATCH_PARENT) {
if (DEBUG_LAYOUT) Slog.v(TAG, "Fullscreen window: " + win); if (DEBUG_LAYOUT) Slog.v(TAG, "Fullscreen window: " + win);
mTopFullscreenOpaqueWindowState = win; mTopFullscreenOpaqueWindowState = win;
if ((attrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0) { if (showWhenLocked && !mHideWindowBehindKeyguard) {
if (DEBUG_LAYOUT) Slog.v(TAG, "Setting mHideLockScreen to true by win " + win); if (DEBUG_LAYOUT) Slog.v(TAG, "Setting mHideLockScreen to true by win " + win);
mHideLockScreen = true; mHideLockScreen = true;
mForceStatusBarFromKeyguard = false; mForceStatusBarFromKeyguard = false;
@@ -3432,6 +3436,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if ((attrs.flags & FLAG_ALLOW_LOCK_WHILE_SCREEN_ON) != 0) { if ((attrs.flags & FLAG_ALLOW_LOCK_WHILE_SCREEN_ON) != 0) {
mAllowLockscreenWhenOn = true; mAllowLockscreenWhenOn = true;
} }
} else if (!showWhenLocked) {
mHideWindowBehindKeyguard = true;
}
} }
} }
} }
@@ -3516,7 +3523,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (mKeyguard != null) { if (mKeyguard != null) {
if (localLOGV) Slog.v(TAG, "finishPostLayoutPolicyLw: mHideKeyguard=" if (localLOGV) Slog.v(TAG, "finishPostLayoutPolicyLw: mHideKeyguard="
+ mHideLockScreen); + mHideLockScreen);
if (mDismissKeyguard != DISMISS_KEYGUARD_NONE && !mKeyguardDelegate.isSecure()) { if (mDismissKeyguard != DISMISS_KEYGUARD_NONE && !isKeyguardSecure()) {
if (mKeyguard.hideLw(true)) { if (mKeyguard.hideLw(true)) {
changes |= FINISH_LAYOUT_REDO_LAYOUT changes |= FINISH_LAYOUT_REDO_LAYOUT
| FINISH_LAYOUT_REDO_CONFIG | FINISH_LAYOUT_REDO_CONFIG