diff options
| author | Craig Mautner <cmautner@google.com> | 2012-03-16 14:01:16 -0700 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2012-03-16 14:05:07 -0700 |
| commit | 1dd3ed09e8623574ef21fd48354eaa46d1edd9ee (patch) | |
| tree | 7871645397ccca6953580176633127cec052719b /services/java/com/android/server/wm/AppWindowToken.java | |
| parent | 4108fbc299bb0c02293ff53fa670308ed81607f7 (diff) | |
| download | frameworks_base-1dd3ed09e8623574ef21fd48354eaa46d1edd9ee.zip frameworks_base-1dd3ed09e8623574ef21fd48354eaa46d1edd9ee.tar.gz frameworks_base-1dd3ed09e8623574ef21fd48354eaa46d1edd9ee.tar.bz2 | |
Perform finish animation actions.
When stepAnimation returns false, do not return false immediately.
Instead carry out finish actions. Also, remove state machine that is no
longer necessary.
Fixes bug 6184070.
Change-Id: I530eb2b62b864bbce929f573d10b31b102152f1f
Diffstat (limited to 'services/java/com/android/server/wm/AppWindowToken.java')
| -rw-r--r-- | services/java/com/android/server/wm/AppWindowToken.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/java/com/android/server/wm/AppWindowToken.java b/services/java/com/android/server/wm/AppWindowToken.java index 5ca09e7..67b667a 100644 --- a/services/java/com/android/server/wm/AppWindowToken.java +++ b/services/java/com/android/server/wm/AppWindowToken.java @@ -240,8 +240,10 @@ class AppWindowToken extends WindowToken { animation.setStartTime(currentTime); animating = true; } - // we're done! - return stepAnimation(currentTime); + if (stepAnimation(currentTime)) { + // we're done! + return true; + } } } else if (animation != null) { // If the display is frozen, and there is a pending animation, |