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

Commit fe172cc8 authored by Daniel Sandler's avatar Daniel Sandler
Browse files

Fix the takeoff position of a flung windowshade. 

We were carefully tracking the vertical offset between the view
origin and the user's incident touch, but not actually
including it when performing a fling. (This might have
worked at one point but been later buried under some
refactoring rubble.)

Bug: 5210198
Change-Id: I97ae883491a5dedf1b48683441096fe9938d118f
parent 8a6d7323

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+5 −6
Original line number Diff line number Diff line
@@ -1458,9 +1458,10 @@ public class PhoneStatusBar extends StatusBar { 
            Slog.d(TAG, "Touch: rawY=" + event.getRawY() + " event=" + event + " mDisabled="

                + mDisabled);

        } else if (CHATTY) {

            if (event.getAction() == MotionEvent.ACTION_DOWN) {

            if (event.getAction() != MotionEvent.ACTION_MOVE) {

                Slog.d(TAG, String.format(

                            "panel: ACTION_DOWN at (%f, %f) mDisabled=0x%08x",

                            "panel: %s at (%f, %f) mDisabled=0x%08x",

                            MotionEvent.actionToString(event.getAction()),

                            event.getRawX(), event.getRawY(), mDisabled));

            }

        }
@@ -1472,9 +1473,8 @@ public class PhoneStatusBar extends StatusBar { 
        final int action = event.getAction();

        final int statusBarSize = mStatusBarView.getHeight();

        final int hitSize = statusBarSize*2;

        if (action == MotionEvent.ACTION_DOWN) {

        final int y = (int)event.getRawY();



        if (action == MotionEvent.ACTION_DOWN) {

            if (!mExpanded) {

                mViewDelta = statusBarSize - y;

            } else {
@@ -1498,7 +1498,6 @@ public class PhoneStatusBar extends StatusBar { 
            trackMovement(event);

            final int minY = statusBarSize + mCloseView.getHeight();

            if (action == MotionEvent.ACTION_MOVE) {

                int y = (int)event.getRawY();

                if (mAnimatingReveal && y < minY) {

                    // nothing

                } else  {
@@ -1533,7 +1532,7 @@ public class PhoneStatusBar extends StatusBar { 
                        vel));

                }



                performFling((int)event.getRawY(), vel, false);

                performFling(y + mViewDelta, vel, false);

            }



        }