commit 763c9b2517deb303116d9fcbe68e82f012fb3d90
author Tony Wickham <twickham@google.com> Thu May 03 20:59:40 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 03 20:59:40 2018 +0000
tree 0ae3163d561d2710fa73f6be3efab1e584873619
parent 4f35687da9a7b5bfd5a1fc124a50358e9685d9a7
parent 43e671131c48462fa9de063b3ef847668fd6aca5

Merge changes from topic "am-a154d380-257c-43f3-8484-78ee3a3259b7" into ub-launcher3-master

* changes:
  [automerger] Don't crash if getWidth is 0 am: 181968b87b
  Don't crash if getWidth is 0

quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java

diff --git a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
index 9fe1018..9dae9df 100644
--- a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
+++ b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
@@ -778,7 +778,12 @@
             int scrollForSecondTask = mRecentsView.getChildCount() > 1
                     ? mRecentsView.getScrollForPage(1) : scrollForFirstTask;
             int offsetFromFirstTask = scrollForFirstTask - scrollForSecondTask;
-            float interpolation = offsetFromFirstTask / (mRecentsView.getWidth() / 2);
+            final float interpolation;
+            if (mRecentsView.getWidth() == 0) {
+                interpolation = scrollForSecondTask == scrollForFirstTask ? 0 : 1;
+            } else {
+                interpolation = (float) offsetFromFirstTask / (mRecentsView.getWidth() / 2);
+            }
             mClipAnimationHelper.offsetTarget(
                     firstTask.getCurveScaleForInterpolation(interpolation), offsetFromFirstTask,
                     mActivityControlHelper.getTranslationYForQuickScrub(mActivity));