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

Commit 82c114ca authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-688aa1b8-4ed3-4170-9276-c3248d214981" into ub-launcher3-master 

* changes:
  [automerger] Add null check before playing recents scale down anim am: 7cc878b5
  Add null check before playing recents scale down anim
parents b5a7d42c 8bf6064f

quickstep/src/com/android/quickstep/ActivityControlHelper.java

+3 −0
Original line number Diff line number Diff line
@@ -299,6 +299,9 @@ public interface ActivityControlHelper<T extends BaseDraggingActivity> { 
        private void playScaleDownAnim(AnimatorSet anim, Launcher launcher) {

            RecentsView recentsView = launcher.getOverviewPanel();

            TaskView v = recentsView.getTaskViewAt(recentsView.getCurrentPage());

            if (v == null) {

                return;

            }

            ClipAnimationHelper clipHelper = new ClipAnimationHelper();

            clipHelper.fromTaskThumbnailView(v.getThumbnail(), (RecentsView) v.getParent(), null);

            if (!clipHelper.getSourceRect().isEmpty() && !clipHelper.getTargetRect().isEmpty()) {