From fe172cc861448cf1115195cbad5b3300357c02f0 Mon Sep 17 00:00:00 2001 From: Daniel Sandler Date: Mon, 12 Sep 2011 13:47:25 -0400 Subject: [PATCH] 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 --- .../com/android/systemui/statusbar/phone/PhoneStatusBar.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index 8cf1b478d9c8..b153613337a8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -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; + final int y = (int)event.getRawY(); if (action == MotionEvent.ACTION_DOWN) { - final int y = (int)event.getRawY(); - 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); } } -- 2.11.0