Merge "Revert "Reland "Prevent dismissing starting window when reopening app""" into qt-dev am: e0d3ce875f
am: df5ed2e842
Change-Id: I21a297a817cc3494a585675b666634f4519dd6a1
This commit is contained in:
@@ -79,7 +79,6 @@ import static com.android.server.wm.WindowManagerService.UPDATE_FOCUS_NORMAL;
|
||||
import static com.android.server.wm.WindowManagerService.UPDATE_FOCUS_WILL_PLACE_SURFACES;
|
||||
import static com.android.server.wm.WindowManagerService.logWithStack;
|
||||
import static com.android.server.wm.WindowState.LEGACY_POLICY_VISIBILITY;
|
||||
import static com.android.server.wm.WindowStateAnimator.HAS_DRAWN;
|
||||
import static com.android.server.wm.WindowStateAnimator.STACK_CLIP_AFTER_ANIM;
|
||||
import static com.android.server.wm.WindowStateAnimator.STACK_CLIP_BEFORE_ANIM;
|
||||
|
||||
@@ -541,14 +540,6 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree
|
||||
// If the app was already visible, don't reset the waitingToShow state.
|
||||
if (isHidden()) {
|
||||
waitingToShow = true;
|
||||
|
||||
// Let's reset the draw state in order to prevent the starting window to be
|
||||
// immediately dismissed when the app still has the surface.
|
||||
forAllWindows(w -> {
|
||||
if (w.mWinAnimator.mDrawState == HAS_DRAWN) {
|
||||
w.mWinAnimator.resetDrawState();
|
||||
}
|
||||
}, true /* traverseTopToBottom */);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user