Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 352faa5b authored by Winson's avatar Winson Committed by android-build-merger
Browse files

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

am: 24abe69d

* commit '24abe69d':
  Fix regression when setting initial offset when docked.
parents 377d000e 24abe69d

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -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);

            /*

            /*