diff options
| author | Winson Chung <winsonc@google.com> | 2017-08-15 16:12:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-15 16:12:42 +0000 |
| commit | 73e3d9f58c9edd2db254f072bd82bcecb2c13275 (patch) | |
| tree | 4ccb44a7fd19ac7fdca28e82b4e5f8251c234d80 | |
| parent | a22dcfed28b7a2d511a4b57027b0faa3d98b2898 (diff) | |
| parent | 684b056531e7a7411d85b77290751ee0f13819b2 (diff) | |
Merge "Add fallback to reset the waiting for transition state." into oc-dr1-dev
am: 684b056531
Change-Id: I77816bf56dedac6127301dc7ffd1f1de3e91031d
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java index 585b151cd693..562210c759fb 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java @@ -69,6 +69,7 @@ import com.android.systemui.recents.events.activity.ToggleRecentsEvent; import com.android.systemui.recents.events.component.ActivityUnpinnedEvent; import com.android.systemui.recents.events.component.RecentsVisibilityChangedEvent; import com.android.systemui.recents.events.component.ScreenPinningRequestEvent; +import com.android.systemui.recents.events.component.SetWaitingForTransitionStartEvent; import com.android.systemui.recents.events.ui.AllTaskViewsDismissedEvent; import com.android.systemui.recents.events.ui.DeleteTaskDataEvent; import com.android.systemui.recents.events.ui.HideIncompatibleAppOverlayEvent; @@ -517,6 +518,11 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD public void onEnterAnimationComplete() { super.onEnterAnimationComplete(); EventBus.getDefault().send(new EnterRecentsWindowAnimationCompletedEvent()); + + // Workaround for b/64694148: The animation started callback is not made (see + // RecentsImpl.getThumbnailTransitionActivityOptions) so reset the transition-waiting state + // once the enter animation has completed. + EventBus.getDefault().send(new SetWaitingForTransitionStartEvent(false)); } @Override |