Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add fallback to reset the waiting for transition state." into oc-dr1-dev

Browse Source 
am: 684b056531

Change-Id: I4cebde819520bba1877a04e773ff128ca37a0af5
This commit is contained in:
Winson Chung
2017-08-15 16:12:42 +00:00
committed by android-build-merger
parent 20fa45e3a9 684b056531
commit 8a661ee248
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
View File

@@ -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;
@@ -502,6 +503,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