summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Daniel Sandler <dsandler@android.com> 2012-10-03 12:29:00 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2012-10-03 12:29:01 -0700
commit76366938242282e37863e1fd8b7fa16e7fd554c1 (patch)
tree2ab3f5a1f9e0c936b3bc7471ea2512a5fe0a7850
parent4b576e39f0ae8fb595843a6e442e39ca90dad51a (diff)
parentdb9a37627835192f582f6c3755aafbc4d0f8e090 (diff)
Merge "Increase the anti-jitter threshold for status bar flings." into jb-mr1-dev
-rw-r--r--packages/SystemUI/res/values/dimens.xml6
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java2
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 5023d234d43b..99036efa6b24 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -103,16 +103,16 @@
<!-- Initial velocity of the shade when collapsing on its own -->
<dimen name="self_collapse_velocity">2000dp</dimen>
<!-- Minimum final velocity of gestures interpreted as expand requests -->
- <dimen name="fling_expand_min_velocity">200dp</dimen>
+ <dimen name="fling_expand_min_velocity">100dp</dimen>
<!-- Minimum final velocity of gestures interpreted as collapse requests -->
- <dimen name="fling_collapse_min_velocity">200dp</dimen>
+ <dimen name="fling_collapse_min_velocity">100dp</dimen>
<!-- Cap on contribution of x dimension of gesture to overall velocity -->
<dimen name="fling_gesture_max_x_velocity">200dp</dimen>
<!-- Cap on overall resulting fling speed (s^-1) -->
<dimen name="fling_gesture_max_output_velocity">3000dp</dimen>
<!-- Minimum distance a fling must travel (anti-jitter) -->
- <dimen name="fling_gesture_min_dist">10dp</dimen>
+ <dimen name="fling_gesture_min_dist">20dp</dimen>
<!-- Minimum fraction of the display a gesture must travel, at any velocity, to qualify as a
collapse request -->
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
index 0550771dc6b9..ca1f75cf44f0 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
@@ -267,7 +267,7 @@ public class PanelView extends FrameLayout {
// preventing spurious flings due to touch screen jitter
final float deltaY = Math.abs(mFinalTouchY - mInitialTouchY);
if (deltaY < mFlingGestureMinDistPx
- || vel < mFlingGestureMinDistPx) {
+ || vel < mFlingExpandMinVelocityPx) {
vel = 0;
}