Prevent getting from transit when interesting window is exiting
AppWindowToken determines when alldrawn state is done to then choose the
transit animation depending on if the next window has a wallpaper or
not. In terms of launcher, it has -1 window without a wallpaper while
the main window has a wallpaper. Meaning that sometimes quickly going
home, services thinks the main window of launcher is exiting and so it
is not considered interesting but the -1 window is drawn and interesting.
Then the system thinks going to launcher has no wallpaper and chooses the
wrong animation.
To fix this issue, assume that if there is a base window (not splash or
starting window) then there is always an interesting window. All the
other windows can enumerate the interesting count until all the windows
including the main window is drawn and ready. This will allow launcher
to wait for the main window to exit and complete drawing before choosing
the next transit animation.
Test: manual - see bugs below
Change-Id: I4839a6f706fa43d295524a5e252a62e8babd1e7d
Fixes: 65304663
Fixes: 65559439
diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java
index a254ba2..43ca81d 100644
--- a/services/core/java/com/android/server/wm/AppWindowToken.java
+++ b/services/core/java/com/android/server/wm/AppWindowToken.java
@@ -106,7 +106,6 @@
import java.io.PrintWriter;
import java.util.ArrayDeque;
import java.util.ArrayList;
-import java.util.LinkedList;
class AppTokenList extends ArrayList<AppWindowToken> {
}
@@ -511,15 +510,25 @@
}
WindowState findMainWindow() {
+ return findMainWindow(true);
+ }
+
+ /**
+ * Finds the main window that either has type base application or application starting if
+ * requested.
+ *
+ * @param includeStartingApp Allow to search application-starting windows to also be returned.
+ * @return The main window of type base application or application starting if requested.
+ */
+ WindowState findMainWindow(boolean includeStartingApp) {
WindowState candidate = null;
- int j = mChildren.size();
- while (j > 0) {
- j--;
+ for (int j = mChildren.size() - 1; j >= 0; --j) {
final WindowState win = mChildren.get(j);
final int type = win.mAttrs.type;
// No need to loop through child window as base application and starting types can't be
// child windows.
- if (type == TYPE_BASE_APPLICATION || type == TYPE_APPLICATION_STARTING) {
+ if (type == TYPE_BASE_APPLICATION
+ || (includeStartingApp && type == TYPE_APPLICATION_STARTING)) {
// In cases where there are multiple windows, we prefer the non-exiting window. This
// happens for example when replacing windows during an activity relaunch. When
// constructing the animation, we want the new window, not the exiting one.
@@ -1367,8 +1376,11 @@
if (mLastTransactionSequence != mService.mTransactionSequence) {
mLastTransactionSequence = mService.mTransactionSequence;
- mNumInterestingWindows = mNumDrawnWindows = 0;
+ mNumDrawnWindows = 0;
startingDisplayed = false;
+
+ // There is the main base application window, even if it is exiting, wait for it
+ mNumInterestingWindows = findMainWindow(false /* includeStartingApp */) != null ? 1 : 0;
}
final WindowStateAnimator winAnimator = w.mWinAnimator;
@@ -1390,7 +1402,10 @@
if (w != startingWindow) {
if (w.isInteresting()) {
- mNumInterestingWindows++;
+ // Add non-main window as interesting since the main app has already been added
+ if (findMainWindow(false /* includeStartingApp */) != w) {
+ mNumInterestingWindows++;
+ }
if (w.isDrawnLw()) {
mNumDrawnWindows++;