commit e00febf61c0a5b8f9526fdf0fbabe46d93e19b0b
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Apr 21 20:30:46 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 21 20:30:51 2017 +0000
tree f81de89e4ec50d9081c8d567b62bbaf7551e43ad
parent 0a02259bba4d0cebe5a6b42aca0665580d3ee8ad
parent 7ccdb52fc98da546bdd565d0757f1fa09522862d

Merge "Increases the minimized width in landscape by statusbar height" into oc-dev

core/java/com/android/internal/policy/DividerSnapAlgorithm.java

diff --git a/core/java/com/android/internal/policy/DividerSnapAlgorithm.java b/core/java/com/android/internal/policy/DividerSnapAlgorithm.java
index 11e7102..fb6b8b0 100644
--- a/core/java/com/android/internal/policy/DividerSnapAlgorithm.java
+++ b/core/java/com/android/internal/policy/DividerSnapAlgorithm.java
@@ -332,8 +332,12 @@
     }
 
     private void addMinimizedTarget(boolean isHorizontalDivision) {
-        int position = mTaskHeightInMinimizedMode;
-        position += isHorizontalDivision ? mInsets.top : mInsets.left;
+        // In portrait offset the position by the statusbar height, in landscape add the statusbar
+        // height as well to match portrait offset
+        int position = mTaskHeightInMinimizedMode + mInsets.top;
+        if (!isHorizontalDivision) {
+            position += mInsets.left;
+        }
         mTargets.add(new SnapTarget(position, position, SnapTarget.FLAG_NONE));
     }