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

Commit 0f174795 authored by Raj Mamadgi's avatar Raj Mamadgi Committed by android-build-merger
Browse files

Merge "Fix for testLifecycleOnMoveToFromSplitScreenRelaunch" 

am: 43d11758

Change-Id: I6b248297523070983c63b5dd870e235eea5ee59c
parents 20a71e4a 43d11758

core/java/com/android/internal/policy/DividerSnapAlgorithm.java

+3 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ public class DividerSnapAlgorithm { 
        mDismissStartTarget = mTargets.get(0);

        mDismissEndTarget = mTargets.get(mTargets.size() - 1);

        mMiddleTarget = mTargets.get(mTargets.size() / 2);

        mMiddleTarget.isMiddleTarget = true;

    }



    /**
@@ -438,6 +439,8 @@ public class DividerSnapAlgorithm { 


        public final int flag;



        public boolean isMiddleTarget;



        /**

         * Multiplier used to calculate distance to snap position. The lower this value, the harder

         * it's to snap on this target

packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java

+3 −0
Original line number Diff line number Diff line
@@ -464,6 +464,9 @@ public class DividerView extends FrameLayout implements OnTouchListener, 
        if (mSnapAlgorithm == null) {

            mSnapAlgorithm = new DividerSnapAlgorithm(getContext().getResources(), mDisplayWidth,

                    mDisplayHeight, mDividerSize, isHorizontalDivision(), mStableInsets, mDockSide);

            if (mSnapTargetBeforeMinimized != null && mSnapTargetBeforeMinimized.isMiddleTarget) {

                mSnapTargetBeforeMinimized = mSnapAlgorithm.getMiddleTarget();

            }

        }

        if (mMinimizedSnapAlgorithm == null) {

            mMinimizedSnapAlgorithm = new DividerSnapAlgorithm(getContext().getResources(),