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

Commit 73e3d9f5 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 oc-dr1-dev 

am: 684b0565

Change-Id: I77816bf56dedac6127301dc7ffd1f1de3e91031d
parents a22dcfed 684b0565

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

+6 −0
Original line number Original line 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.ActivityUnpinnedEvent;

import com.android.systemui.recents.events.component.RecentsVisibilityChangedEvent;

import com.android.systemui.recents.events.component.RecentsVisibilityChangedEvent;

import com.android.systemui.recents.events.component.ScreenPinningRequestEvent;

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.AllTaskViewsDismissedEvent;

import com.android.systemui.recents.events.ui.DeleteTaskDataEvent;

import com.android.systemui.recents.events.ui.DeleteTaskDataEvent;

import com.android.systemui.recents.events.ui.HideIncompatibleAppOverlayEvent;

import com.android.systemui.recents.events.ui.HideIncompatibleAppOverlayEvent;
@@ -517,6 +518,11 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD 
    public void onEnterAnimationComplete() {

    public void onEnterAnimationComplete() {

        super.onEnterAnimationComplete();

        super.onEnterAnimationComplete();

        EventBus.getDefault().send(new EnterRecentsWindowAnimationCompletedEvent());

        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

    @Override