From 360d64e90ec0a0a58ff99c7dcfcb83ee905a8f4a Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sat, 20 Feb 2016 00:56:47 +0200 Subject: [PATCH] SystemUI: Don't vibrate on touchscreen camera gesture * This is usually handled in device-specific keyhandler, where vibration is optional and has the same duration in all gestures Change-Id: I879671c9d6f785137d63b8b70de35f5d5020748d --- .../com/android/systemui/statusbar/phone/PhoneStatusBar.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 f76acaa5c6203..a80f748723c20 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -5831,7 +5831,9 @@ public void onCameraLaunchGestureDetected(int source) { pm.wakeUp(SystemClock.uptimeMillis(), "com.android.systemui:CAMERA_GESTURE"); mStatusBarKeyguardViewManager.notifyDeviceWakeUpRequested(); } - vibrateForCameraGesture(); + if (source != StatusBarManager.CAMERA_LAUNCH_SOURCE_SCREEN_GESTURE) { + vibrateForCameraGesture(); + } if (!mStatusBarKeyguardViewManager.isShowing()) { startActivity(KeyguardBottomAreaView.INSECURE_CAMERA_INTENT, true /* dismissShade */);