commit | 340e7d257362fddb0fad0450b88556745381ce4b | [log] [tgz] |
---|---|---|
author | Jason Monk <jmonk@google.com> | Fri Jul 28 20:31:04 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jul 28 20:31:04 2017 +0000 |
tree | 2fda1810a2c2e1b8b8eaf3d1fb91aa66bcd0b281 | |
parent | 94b8ed8964fe429837134ce9a0f2f78d2a75dd44 [diff] | |
parent | ac73492ca56ae51cc4e1addc8a159fbc925d6094 [diff] |
Merge "Nav haptics: increase threshold to 150 and don't do on long clicks" into oc-dr1-dev am: ac73492ca5 Change-Id: I8ce276208b39618d7ff2c46a5cca5a2356633d6f
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java index d652bde..08ea543 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java
@@ -228,7 +228,7 @@ setPressed(false); // Always send a release ourselves because it doesn't seem to be sent elsewhere // and it feels weird to sometimes get a release haptic and other times not. - if ((SystemClock.uptimeMillis() - mDownTime) > 100) { + if ((SystemClock.uptimeMillis() - mDownTime) > 150 && !mLongClicked) { performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY_RELEASE); } if (mCode != 0) {