Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb280ca1 authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

Merge "Add fallback to reset the waiting for transition state." into... 

Merge "Add fallback to reset the waiting for transition state." into oc-dr1-dev am: 684b0565 am: 8a661ee2
am: dd4a03a5

Change-Id: I0dad59573050cba4ee98bf5d15a7c85931b9199f
parents 83ce8835 dd4a03a5

packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java

+6 −0
Original line number Diff line number Diff line
@@ -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