diff options
| author | 2017-08-15 16:22:47 +0000 | |
|---|---|---|
| committer | 2017-08-15 16:22:47 +0000 | |
| commit | dd4a03a53b362956caefee868bf5c421b30600b5 (patch) | |
| tree | 65a809caf96bdafbb97964294295a1c781ac0889 | |
| parent | 11f7eebe5b7c7afad9dc8d1b0756aec7e22211d8 (diff) | |
| parent | 8a661ee24803525d6cf04bd5e58f1b0366f56551 (diff) | |
Merge "Add fallback to reset the waiting for transition state." into oc-dr1-dev am: 684b056531
am: 8a661ee248
Change-Id: I5b8f59e5d55914960545dbc55b9087a4410f8987
| -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 |