diff options
| author | 2016-11-11 00:43:51 +0000 | |
|---|---|---|
| committer | 2016-11-11 00:43:54 +0000 | |
| commit | 1c47a0bea6502a6029ec959c6c13b76dd93e0dcc (patch) | |
| tree | 1df56d8c768f537bc1a729abe8b16ee47b75fb2c | |
| parent | a42d5770c72227b18c5e44bf415e5b8fc947f7a6 (diff) | |
| parent | f9fc128d7f0efee23a7ac80fb8b808af58726233 (diff) | |
Merge "Customize camera gesture vibrator pattern"
| -rw-r--r-- | packages/SystemUI/res/values/config.xml | 6 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 9 |
2 files changed, 14 insertions, 1 deletions
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 9eea3750a8ec..0f5d37ea3691 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -48,6 +48,12 @@ <!-- Whether or not we show the number in the bar. --> <bool name="config_statusBarShowNumber">false</bool> + <!-- Vibrator pattern for camera gesture launch. --> + <integer-array translatable="false" name="config_cameraLaunchGestureVibePattern"> + <item>0</item> + <item>400</item> + </integer-array> + <!-- How many icons may be shown at once in the system bar. Includes any slots that may be reused for things like IME control. --> <integer name="config_maxNotificationIcons">5</integer> 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 2f3631c19df9..0f7ad5903bc5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -561,6 +561,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, private int mLastCameraLaunchSource; private PowerManager.WakeLock mGestureWakeLock; private Vibrator mVibrator; + private long[] mCameraLaunchGestureVibePattern; // Fingerprint (as computed by getLoggingFingerprint() of the last logged state. private int mLastLoggedStateFingerprint; @@ -996,6 +997,12 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, mGestureWakeLock = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK, "GestureWakeLock"); mVibrator = mContext.getSystemService(Vibrator.class); + int[] pattern = mContext.getResources().getIntArray( + R.array.config_cameraLaunchGestureVibePattern); + mCameraLaunchGestureVibePattern = new long[pattern.length]; + for (int i = 0; i < pattern.length; i++) { + mCameraLaunchGestureVibePattern[i] = pattern[i]; + } // receive broadcasts IntentFilter filter = new IntentFilter(); @@ -4880,7 +4887,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, private void vibrateForCameraGesture() { // Make sure to pass -1 for repeat so VibratorService doesn't stop us when going to sleep. - mVibrator.vibrate(new long[]{0, 400}, -1 /* repeat */); + mVibrator.vibrate(mCameraLaunchGestureVibePattern, -1 /* repeat */); } public void onScreenTurnedOn() { |