diff options
| author | Tony Wickham <twickham@google.com> | 2018-07-19 21:55:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-07-19 21:55:36 +0000 |
| commit | ae71e086a2fc23257e3d6de895883135d95d7144 (patch) | |
| tree | c753731f999af39f8ee21d69ce67dedaa2fb6f6f | |
| parent | 7b8ed5a111ee6c9327528d72b550f648fd301be0 (diff) | |
| parent | 7cc878b5aeefe06adaf0217be429b3f36a86d19b (diff) | |
| download | android_packages_apps_Trebuchet-ae71e086a2fc23257e3d6de895883135d95d7144.tar.gz android_packages_apps_Trebuchet-ae71e086a2fc23257e3d6de895883135d95d7144.tar.bz2 android_packages_apps_Trebuchet-ae71e086a2fc23257e3d6de895883135d95d7144.zip | |
Merge "Add null check before playing recents scale down anim" into ub-launcher3-edmonton-polish
| -rw-r--r-- | quickstep/src/com/android/quickstep/ActivityControlHelper.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/quickstep/src/com/android/quickstep/ActivityControlHelper.java b/quickstep/src/com/android/quickstep/ActivityControlHelper.java index 275075f27..ced87542d 100644 --- a/quickstep/src/com/android/quickstep/ActivityControlHelper.java +++ b/quickstep/src/com/android/quickstep/ActivityControlHelper.java @@ -294,6 +294,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()) { |