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

Resolved conflicts for merge of ad63d914 to jb-mr2-dev

Browse Source 
Change-Id: Iea4cec4ce6f588c9f976ac5a1ff0208f1f91471b
This commit is contained in:
Craig Mautner
2014-03-13 12:35:23 -07:00
parent 8b91693683 ad63d91439
commit 1066fc61a3
1 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -383,6 +383,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;
@@ -3212,6 +3213,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;
@@ -3249,7 +3251,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
@@ -3257,31 +3259,38 @@ 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;
&& attrs.width == WindowManager.LayoutParams.MATCH_PARENT if (appWindow) {
&& attrs.height == WindowManager.LayoutParams.MATCH_PARENT) { if (attrs.x == 0 && attrs.y == 0
if (DEBUG_LAYOUT) Log.v(TAG, "Fullscreen window: " + win); && attrs.width == WindowManager.LayoutParams.MATCH_PARENT
mTopFullscreenOpaqueWindowState = win; && attrs.height == WindowManager.LayoutParams.MATCH_PARENT) {
if ((attrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0) { if (DEBUG_LAYOUT) Slog.v(TAG, "Fullscreen window: " + win);
if (DEBUG_LAYOUT) Log.v(TAG, "Setting mHideLockScreen to true by win " + win); mTopFullscreenOpaqueWindowState = win;
mHideLockScreen = true; if (!mHideWindowBehindKeyguard) {
mForceStatusBarFromKeyguard = false; if (showWhenLocked) {
} if (DEBUG_LAYOUT) Slog.v(TAG, "Setting mHideLockScreen to true by win " + win);
if ((attrs.flags & FLAG_DISMISS_KEYGUARD) != 0 mHideLockScreen = true;
&& mDismissKeyguard == DISMISS_KEYGUARD_NONE) { mForceStatusBarFromKeyguard = false;
if (DEBUG_LAYOUT) Log.v(TAG, "Setting mDismissKeyguard to true by win " + win); }
mDismissKeyguard = mWinDismissingKeyguard == win ? if ((attrs.flags & FLAG_DISMISS_KEYGUARD) != 0
DISMISS_KEYGUARD_CONTINUE : DISMISS_KEYGUARD_START; && mDismissKeyguard == DISMISS_KEYGUARD_NONE) {
mWinDismissingKeyguard = win; if (DEBUG_LAYOUT) Slog.v(TAG, "Setting mDismissKeyguard true by win " + win);
mForceStatusBarFromKeyguard = mDismissKeyguard = mWinDismissingKeyguard == win ?
mShowingLockscreen && mKeyguardMediator.isSecure(); DISMISS_KEYGUARD_CONTINUE : DISMISS_KEYGUARD_START;
} mWinDismissingKeyguard = win;
if ((attrs.flags & FLAG_ALLOW_LOCK_WHILE_SCREEN_ON) != 0) { mForceStatusBarFromKeyguard =
mAllowLockscreenWhenOn = true; mShowingLockscreen && mKeyguardMediator.isSecure();
}
}
if ((attrs.flags & FLAG_ALLOW_LOCK_WHILE_SCREEN_ON) != 0) {
mAllowLockscreenWhenOn = true;
}
} else if (!showWhenLocked) {
mHideWindowBehindKeyguard = true;
} }
} }
} }
@@ -3360,7 +3369,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (mKeyguard != null) { if (mKeyguard != null) {
if (localLOGV) Log.v(TAG, "finishPostLayoutPolicyLw: mHideKeyguard=" if (localLOGV) Log.v(TAG, "finishPostLayoutPolicyLw: mHideKeyguard="
+ mHideLockScreen); + mHideLockScreen);
if (mDismissKeyguard != DISMISS_KEYGUARD_NONE && !mKeyguardMediator.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