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

Commit c25af400 authored by Selim Cinek's avatar Selim Cinek
Browse files

Follow up fixes for expandhelper 

Change-Id: I51fab5bee481889101e8f5553b9a5d9fe2cba6c3
Test: manual
parent fc975d63

packages/SystemUI/src/com/android/systemui/ExpandHelper.java

+4 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ public class ExpandHelper implements Gefingerpoken { 
            case MotionEvent.ACTION_CANCEL:

            case MotionEvent.ACTION_UP:

                if (DEBUG) Log.d(TAG, "up/cancel");

                finishExpanding(ev.getActionMasked() == MotionEvent.ACTION_CANCEL,

                finishExpanding(ev.getActionMasked() == MotionEvent.ACTION_CANCEL /* forceAbort */,

                        getCurrentVelocity());

                clearView();

                break;
@@ -587,6 +587,9 @@ public class ExpandHelper implements Gefingerpoken { 
            mFlingAnimationUtils.apply(mScaleAnimation, currentHeight, targetHeight, velocity);

            mScaleAnimation.start();

        } else {

            if (targetHeight != currentHeight) {

                mScaler.setHeight(targetHeight);

            }

            mCallback.setUserExpandedChild(mResizedView, nowExpanded);

            mCallback.setUserLockedChild(mResizedView, false);

        }