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

Merge "DO NOT MERGE Set force hiding differently" into jb-dev

Browse Source
This commit is contained in:
Craig Mautner
2012-07-02 17:20:00 -07:00
committed by Android (Google) Code Review
parent 00b9e89932 503d6a44a8
commit cc93507124
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/wm/WindowAnimator.java
View File

@@ -3,6 +3,7 @@
package com.android.server.wm; package com.android.server.wm;
import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER; import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;
import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;
import static com.android.server.wm.WindowManagerService.LayoutFields.SET_UPDATE_ROTATION; import static com.android.server.wm.WindowManagerService.LayoutFields.SET_UPDATE_ROTATION;
import static com.android.server.wm.WindowManagerService.LayoutFields.SET_WALLPAPER_MAY_CHANGE; import static com.android.server.wm.WindowManagerService.LayoutFields.SET_WALLPAPER_MAY_CHANGE;
@@ -278,7 +279,7 @@ public class WindowAnimator {
} }
mService.mFocusMayChange = true; mService.mFocusMayChange = true;
} }
if (win.isReadyForDisplay() && !winAnimator.isAnimating()) { if (win.isReadyForDisplay() && winAnimator.mAnimationIsEntrance) {
mForceHiding = true; mForceHiding = true;
} }
if (WindowManagerService.DEBUG_VISIBILITY) Slog.v(TAG, if (WindowManagerService.DEBUG_VISIBILITY) Slog.v(TAG,
@@ -292,7 +293,8 @@ public class WindowAnimator {
+ " anim=" + win.mWinAnimator.mAnimation); + " anim=" + win.mWinAnimator.mAnimation);
} else if (mPolicy.canBeForceHidden(win, win.mAttrs)) { } else if (mPolicy.canBeForceHidden(win, win.mAttrs)) {
final boolean changed; final boolean changed;
if (mForceHiding && !winAnimator.isAnimating()) { if (mForceHiding && (!winAnimator.isAnimating()
|| (winAnimator.mAttrFlags & FLAG_SHOW_WHEN_LOCKED) == 0)) {
changed = win.hideLw(false, false); changed = win.hideLw(false, false);
if (WindowManagerService.DEBUG_VISIBILITY && changed) Slog.v(TAG, if (WindowManagerService.DEBUG_VISIBILITY && changed) Slog.v(TAG,
"Now policy hidden: " + win); "Now policy hidden: " + win);