diff options
| author | Michael Bestas <mikeioannina@cyanogenmod.org> | 2016-02-20 00:56:47 +0200 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-02-27 02:27:47 -0800 |
| commit | de45e4b6958d4ae5c01b296d01d0a13c22f43db4 (patch) | |
| tree | b4e8e08352101e6a0c57c4b2c149647b6bbd76a0 /packages | |
| parent | e0c77b2cc521578cdfcc383294653819b46c93a8 (diff) | |
| download | frameworks_base-de45e4b6958d4ae5c01b296d01d0a13c22f43db4.zip frameworks_base-de45e4b6958d4ae5c01b296d01d0a13c22f43db4.tar.gz frameworks_base-de45e4b6958d4ae5c01b296d01d0a13c22f43db4.tar.bz2 | |
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
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 4 |
1 files changed, 3 insertions, 1 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 efeb77a..b68a8b7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -5221,7 +5221,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 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 */); |