Skip to content

Commit 03273d0

Browse files
author
Craig Mautner
committed
Continue animations started from AppWindowToken.
Animations that were started from AppWindowToken.showAllWindowsLocked were not setting mInnerFields.mAnimating and hence the animations were not progressing. This resulted in popups such as menus and time/date settings not showing up. Fixes bug 6205076. Change-Id: I4daae5895e64182328671e282331f14dd5561d5e
1 parent 006f0e4 commit 03273d0

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

services/java/com/android/server/wm/AppWindowToken.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,14 +190,17 @@ void sendAppVisibilityToClients() {
190190
}
191191
}
192192

193-
void showAllWindowsLocked() {
193+
boolean showAllWindowsLocked() {
194+
boolean isAnimating = false;
194195
final int NW = allAppWindows.size();
195196
for (int i=0; i<NW; i++) {
196197
WindowState w = allAppWindows.get(i);
197198
if (WindowManagerService.DEBUG_VISIBILITY) Slog.v(WindowManagerService.TAG,
198199
"performing show on: " + w);
199200
w.performShowLocked();
201+
isAnimating |= w.isAnimating();
200202
}
203+
return isAnimating;
201204
}
202205

203206

services/java/com/android/server/wm/WindowManagerService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7947,7 +7947,7 @@ private int testTokenMayBeDrawnLocked() {
79477947

79487948
// We can now show all of the drawn windows!
79497949
if (!mOpeningApps.contains(wtoken)) {
7950-
wtoken.showAllWindowsLocked();
7950+
mInnerFields.mAnimating |= wtoken.showAllWindowsLocked();
79517951
}
79527952
}
79537953
}
@@ -8131,7 +8131,7 @@ public int handleAppTransitionReadyLocked() {
81318131
transit, false);
81328132
wtoken.updateReportedVisibilityLocked();
81338133
wtoken.waitingToShow = false;
8134-
wtoken.showAllWindowsLocked();
8134+
mInnerFields.mAnimating |= wtoken.showAllWindowsLocked();
81358135
}
81368136
NN = mClosingApps.size();
81378137
for (i=0; i<NN; i++) {

0 commit comments

Comments
 (0)