Merge "Fix regression when setting initial offset when docked." into nyc-dev

This commit is contained in:
Winson Chung
2016-03-10 02:32:15 +00:00
committed by Android (Google) Code Review

View File

@@ -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);
/*