summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Michael Wright <michaelwr@google.com> 2017-09-01 02:41:39 +0000
committer android-build-merger <android-build-merger@google.com> 2017-09-01 02:41:39 +0000
commit60ab353fb65aed98b3c97f931e83560129cc9cd7 (patch)
tree5810da1bbb29cf3c3bcb985e01d51d2e18790b19
parentdea1cbe0ed8611c0cb5c4a0425228e882be1dba9 (diff)
parentfbc5d5d7c58af5210ddb349d2060357d62662d23 (diff)
Merge "Don't vibrate on un-tuned devices when opening notification shade." into oc-mr1-dev
am: fbc5d5d7c5 Change-Id: Ib1f111b87878abe4c2fd4d800e950feb6a45d7be
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java4
1 files changed, 2 insertions, 2 deletions
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 46f9c04aa42e..afe5c917a856 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
@@ -404,8 +404,8 @@ public abstract class PanelView extends FrameLayout {
false /* collapseWhenFinished */);
notifyBarPanelExpansionChanged();
if (mVibrateOnOpening && !isHapticFeedbackDisabled(mContext)) {
- AsyncTask.execute(
- () -> mVibrator.vibrate(VibrationEffect.get(VibrationEffect.EFFECT_TICK)));
+ AsyncTask.execute(() ->
+ mVibrator.vibrate(VibrationEffect.get(VibrationEffect.EFFECT_TICK, false)));
}
}