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

am ae8c2c71: Merge "Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard..." into froyo

Browse Source 
Merge commit 'ae8c2c71f7791ed0321e56f31f0c1276da4d8842' into froyo-plus-aosp

* commit 'ae8c2c71f7791ed0321e56f31f0c1276da4d8842':
  Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard...
This commit is contained in:
Dianne Hackborn
2010-04-13 17:59:56 -07:00
committed by Android Git Automerger
parent 53a37509c3 ae8c2c71f7
commit fbd22f072b
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/java/com/android/server/WindowManagerService.java
View File

@@ -4418,7 +4418,8 @@ public class WindowManagerService extends IWindowManager.Stub
final int N = mWindows.size(); final int N = mWindows.size();
for (int i=0; i<N; i++) { for (int i=0; i<N; i++) {
WindowState w = (WindowState)mWindows.get(i); WindowState w = (WindowState)mWindows.get(i);
if (w.isVisibleLw() && !w.mObscured && !w.isDrawnLw()) { if (w.isVisibleLw() && !w.mObscured
&& (w.mOrientationChanging || !w.isDrawnLw())) {
return; return;
} }
} }
@@ -7925,7 +7926,7 @@ public class WindowManagerService extends IWindowManager.Stub
final AppWindowToken atoken = mAppToken; final AppWindowToken atoken = mAppToken;
return mSurface != null && !mAttachedHidden return mSurface != null && !mAttachedHidden
&& (atoken == null ? mPolicyVisibility : !atoken.hiddenRequested) && (atoken == null ? mPolicyVisibility : !atoken.hiddenRequested)
&& !mDrawPending && !mCommitDrawPending && (mOrientationChanging || (!mDrawPending && !mCommitDrawPending))
&& !mExiting && !mDestroying; && !mExiting && !mDestroying;
} }
@@ -8029,12 +8030,14 @@ public class WindowManagerService extends IWindowManager.Stub
/** /**
* Returns true if the window has a surface that it has drawn a * Returns true if the window has a surface that it has drawn a
* complete UI in to. * complete UI in to. Note that this returns true if the orientation
* is changing even if the window hasn't redrawn because we don't want
* to stop things from executing during that time.
*/ */
public boolean isDrawnLw() { public boolean isDrawnLw() {
final AppWindowToken atoken = mAppToken; final AppWindowToken atoken = mAppToken;
return mSurface != null && !mDestroying return mSurface != null && !mDestroying
&& !mDrawPending && !mCommitDrawPending; && (mOrientationChanging || (!mDrawPending && !mCommitDrawPending));
} }
public boolean fillsScreenLw(int screenWidth, int screenHeight, public boolean fillsScreenLw(int screenWidth, int screenHeight,
@@ -10292,6 +10295,12 @@ public class WindowManagerService extends IWindowManager.Stub
if (w.mAttachedHidden || !w.isReadyForDisplay()) { if (w.mAttachedHidden || !w.isReadyForDisplay()) {
if (!w.mLastHidden) { if (!w.mLastHidden) {
//dump(); //dump();
if (DEBUG_CONFIGURATION) Slog.v(TAG, "Window hiding: waitingToShow="
+ w.mRootToken.waitingToShow + " polvis="
+ w.mPolicyVisibility + " atthid="
+ w.mAttachedHidden + " tokhid="
+ w.mRootToken.hidden + " vis="
+ w.mViewVisibility);
w.mLastHidden = true; w.mLastHidden = true;
if (SHOW_TRANSACTIONS) logSurface(w, if (SHOW_TRANSACTIONS) logSurface(w,
"HIDE (performLayout)", null); "HIDE (performLayout)", null);