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

am e777e0a3: Merge change 25388 into eclair

Browse Source 
Merge commit 'e777e0a3d1645c1b54f12af5779cb7ccf0c82234' into eclair-plus-aosp

* commit 'e777e0a3d1645c1b54f12af5779cb7ccf0c82234':
  Fix #1827299: Google login screen to re-enter password is not viewable
This commit is contained in:
Dianne Hackborn
2009-09-17 08:42:53 -07:00
committed by Android Git Automerger
parent b3278a5c8a e777e0a3d1
commit 11ae4695c1
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7056,7 +7056,7 @@ public class WindowManagerService extends IWindowManager.Stub
+ " attHidden=" + mAttachedHidden
+ " tok.hiddenRequested="
+ (mAppToken != null ? mAppToken.hiddenRequested : false)
+ " tok.idden="
+ " tok.hidden="
+ (mAppToken != null ? mAppToken.hidden : false)
+ " animating=" + mAnimating
+ " tok animating="
@@ -7085,10 +7085,20 @@ public class WindowManagerService extends IWindowManager.Stub
if (mAttrs.type != TYPE_APPLICATION_STARTING
&& mAppToken != null) {
mAppToken.firstWindowDrawn = true;
if (mAnimation == null && mAppToken.startingData != null) {
if (mAppToken.startingData != null) {
if (DEBUG_STARTING_WINDOW) Log.v(TAG, "Finish starting "
+ mToken
+ ": first real window is shown, no animation");
// If this initial window is animating, stop it -- we
// will do an animation to reveal it from behind the
// starting window, so there is no need for it to also
// be doing its own stuff.
if (mAnimation != null) {
mAnimation = null;
// Make sure we clean up the animation.
mAnimating = true;
}
mFinishedStarting.add(mAppToken);
mH.sendEmptyMessage(H.FINISHED_STARTING);
}