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 
am: d2130267a7

* commit 'd2130267a77c968c6f5384298fcfdb85daa0763a':
  Fix regression when setting initial offset when docked.
This commit is contained in:
Winson
2016-03-10 02:38:47 +00:00
committed by android-build-merger
parent c742752735 d2130267a7
commit 24abe69de3
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;
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);
/*