commit 0d1db51ce858bcdbe92616460fca2122b9c81dfe
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 16 20:25:07 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 16 20:25:07 2018 +0000
tree 1c2cb1d8f3dbab167cad289e4733704603b4ab4c
parent c212649c13b0139f8f5f5214d45d501c36757de5
parent de7532154259ed79d7ed6d2fcc9e82ff2860a5a3

Merge "Fixing wrong accessibility focus when opening a floating view" into ub-launcher3-edmonton

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 c28a6bd..8c7f104 100644
--- a/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java
+++ b/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java
@@ -259,10 +259,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) {