Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Winson Chung
2016-03-10 02:32:15 +00:00
committed by Android (Google) Code Review
parent ef33726e14 809a5b128d
commit d2130267a7
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java
View File

@@ -514,7 +514,10 @@ public class TaskStackLayoutAlgorithm {
(mHeaderBarHeight * 1f) + 1; (mHeaderBarHeight * 1f) + 1;
float initialFocusedOffsetPct = initialFocusedOffset / mStackRect.height(); float initialFocusedOffsetPct = initialFocusedOffset / mStackRect.height();
float initialFocusedNormX = mUnfocusedCurveInterpolator.getX(initialFocusedOffsetPct); float initialFocusedNormX = mUnfocusedCurveInterpolator.getX(initialFocusedOffsetPct);
float initialBottomOffset = mStackBottomOffset + mInitialBottomPeekHeight; float initialBottomOffset = mStackBottomOffset +
(ssp.hasDockedTask()
? mHeaderBarHeight
: mInitialBottomPeekHeight);
float initialBottomOffsetPct = initialBottomOffset / mStackRect.height(); float initialBottomOffsetPct = initialBottomOffset / mStackRect.height();
float initialBottomNormX = mUnfocusedCurveInterpolator.getX(initialBottomOffsetPct); float initialBottomNormX = mUnfocusedCurveInterpolator.getX(initialBottomOffsetPct);
/* /*