From 809a5b128d20368ca24b974521ba88e7bd0eba99 Mon Sep 17 00:00:00 2001
From: Winson <winsonc@google.com>
Date: Wed, 9 Mar 2016 18:30:32 -0800
Subject: [PATCH] Fix regression when setting initial offset when docked.

Change-Id: Ide8e9eb2d97b5540186736fc73b093e4385613bd
---
 .../com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java
index 7f4467b37a44..6df5884328b3 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java
@@ -514,7 +514,10 @@ public class TaskStackLayoutAlgorithm {
                     (mHeaderBarHeight * 1f) + 1;
             float initialFocusedOffsetPct = initialFocusedOffset / mStackRect.height();
             float initialFocusedNormX = mUnfocusedCurveInterpolator.getX(initialFocusedOffsetPct);
-            float initialBottomOffset = mStackBottomOffset + mInitialBottomPeekHeight;
+            float initialBottomOffset = mStackBottomOffset +
+                    (ssp.hasDockedTask()
+                        ? mHeaderBarHeight
+                        : mInitialBottomPeekHeight);
             float initialBottomOffsetPct = initialBottomOffset / mStackRect.height();
             float initialBottomNormX = mUnfocusedCurveInterpolator.getX(initialBottomOffsetPct);
             /*
-- 
2.11.0