drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev

Browse Source 
* commit '86f9a93e20bf33b9f5152592f4781bd253be8643':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
This commit is contained in:
Craig Mautner
2014-03-25 09:48:27 -07:00
committed by Android Git Automerger
parent 665b07579a 86f9a93e20
commit 95d6e32bc3
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,6 +153,7 @@ import java.io.File;
import java.io.FileReader; import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.HashSet;
/** /**
* WindowManagerPolicy implementation for the Android phone UI. This * WindowManagerPolicy implementation for the Android phone UI. This
@ -408,7 +409,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
static final Rect mTmpNavigationFrame = new Rect(); static final Rect mTmpNavigationFrame = new Rect();
WindowState mTopFullscreenOpaqueWindowState; WindowState mTopFullscreenOpaqueWindowState;
boolean mHideWindowBehindKeyguard; HashSet<IApplicationToken> mAppsToBeHidden = new HashSet<IApplicationToken>();
boolean mTopIsFullscreen; boolean mTopIsFullscreen;
boolean mForceStatusBar; boolean mForceStatusBar;
boolean mForceStatusBarFromKeyguard; boolean mForceStatusBarFromKeyguard;
@ -2937,7 +2938,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; mAppsToBeHidden.clear();
mForceStatusBar = false; mForceStatusBar = false;
mForceStatusBarFromKeyguard = false; mForceStatusBarFromKeyguard = false;
mForcingShowNavBar = false; mForcingShowNavBar = false;
@ -2989,12 +2990,17 @@ public class PhoneWindowManager implements WindowManagerPolicy {
final boolean showWhenLocked = (attrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0; final boolean showWhenLocked = (attrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0;
if (appWindow) { if (appWindow) {
if (showWhenLocked) {
mAppsToBeHidden.remove(win.getAppToken());
} else {
mAppsToBeHidden.add(win.getAppToken());
}
if (attrs.x == 0 && attrs.y == 0 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 (!mHideWindowBehindKeyguard) { if (mAppsToBeHidden.isEmpty()) {
if (showWhenLocked) { if (showWhenLocked) {
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;
@ -3012,8 +3018,6 @@ 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;
} }
} }
} }