commit 43e671131c48462fa9de063b3ef847668fd6aca5
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu May 03 19:50:58 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu May 03 19:50:58 2018 +0000
tree 59a4dacff01ca9b90a35264f25aa339b0289bc7e
parent 59c36cbb66e170e49ea0cb6ecd8e482158f3dd3e
parent 181968b87ba7557281d1d5dbb13d2c5012c1dc9c

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

Change-Id: I3b2ab2d687b282193e641d3255865769b4000675

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));