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

Commit 806a23de authored by Matthew Ng's avatar Matthew Ng Committed by android-build-merger
Browse files

Merge "Fixes divider position after minimizing and unminimizing with ime open"... 

Merge "Fixes divider position after minimizing and unminimizing with ime open" into oc-dev am: 81a57133
am: ca3beabd

Change-Id: Iaad285a169f86a66390891de79f3025ee259c2a7
parents c91ea7f8 ca3beabd

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

+12 −4
Original line number Diff line number Diff line
@@ -767,17 +767,22 @@ public class DividerView extends FrameLayout implements OnTouchListener, 
            mDockedStackMinimized = minimized;

        } else if (mDockedStackMinimized != minimized) {

            mIsInMinimizeInteraction = true;

            if (minimized && (mCurrentAnimator == null || !mCurrentAnimator.isRunning())) {

            if (minimized && (mCurrentAnimator == null || !mCurrentAnimator.isRunning())

                    && (mDividerPositionBeforeMinimized <= 0 || !mAdjustedForIme)) {

                mDividerPositionBeforeMinimized = getCurrentPosition();

            }

            mMinimizedSnapAlgorithm = null;

            mDockedStackMinimized = minimized;

            initializeSnapAlgorithm();

            stopDragging(getCurrentPosition(), minimized ?

                            mMinimizedSnapAlgorithm.getMiddleTarget() :

                            mSnapAlgorithm.calculateNonDismissingSnapTarget(

            stopDragging(minimized

                            ? mDividerPositionBeforeMinimized

                            : getCurrentPosition(),

                    minimized

                            ? mMinimizedSnapAlgorithm.getMiddleTarget()

                            : mSnapAlgorithm.calculateNonDismissingSnapTarget(

                                    mDividerPositionBeforeMinimized),

                    animDuration, Interpolators.FAST_OUT_SLOW_IN, 0);

            setAdjustedForIme(false, animDuration);

        }

        if (!minimized) {

            mBackground.animate().withEndAction(mResetBackgroundRunnable);
@@ -820,6 +825,9 @@ public class DividerView extends FrameLayout implements OnTouchListener, 
                .setDuration(animDuration)

                .start();

        mAdjustedForIme = adjustedForIme;

        if (mHomeStackResizable && adjustedForIme) {

            mDividerPositionBeforeMinimized = getCurrentPosition();

        }

    }



    private void resetBackground() {