commit 51ddb12824f834155db7fe6139140b36281232d7
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Mon May 14 18:08:48 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Mon May 14 18:08:48 2018 +0000
tree 6260180cddf1e2b20f155a1d35c6c4aa457615ec
parent dd5cc877aea1057332ca332165a9825ee37afacf
parent 55631dd8afbc52c83c50a5ade0fe28a454d86862

[automerger] Fixing task location calculation in seascape am: 55631dd8af

Change-Id: I8990e3501515818dccea4457a94a14f0cbcf1272

quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java

diff --git a/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java b/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java
index 14b4046..a25b77d 100644
--- a/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java
+++ b/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java
@@ -250,10 +250,11 @@
             taskHeight = taskHeight / 2 - halfDividerSize;
         }
 
+        // Align the task to bottom left/right edge (closer to nav bar).
+        int left = activity.getDeviceProfile().isSeascape() ? insets.left
+                : (insets.left + fullDp.availableWidthPx - taskWidth);
         mSourceStackBounds.set(0, 0, taskWidth, taskHeight);
-        // Align the task to bottom right (probably not true for seascape).
-        mSourceStackBounds.offset(insets.left + fullDp.availableWidthPx - taskWidth,
-                insets.top + fullDp.availableHeightPx - taskHeight);
+        mSourceStackBounds.offset(left, insets.top + fullDp.availableHeightPx - taskHeight);
     }
 
     public void drawForProgress(TaskThumbnailView ttv, Canvas canvas, float progress) {