Merge "Revert "Change attrbute of double-power-to-camera vibration"" into qt-dev (697989a6) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+1 −12

Original line number	Diff line number	Diff line
		@@ -317,17 +317,6 @@ public class StatusBar extends SystemUI implements DemoMode,
		/** If true, the lockscreen will show a distinct wallpaper */
		public static final boolean ENABLE_LOCKSCREEN_WALLPAPER = true;

		private static final AudioAttributes AUDIO_ATTRIBUTES =
		new AudioAttributes.Builder()
		.setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
		// Temporary fix for b/123870990. No time in this release to
		// introduce a new vibration type, but we need to distinguish these vibrations
		// from other haptic feedback vibrations. Fortunately, Alarm vibrations have
		// exactly the same behavior as we need
		// TODO: refactor within the scope of b/132170758
		.setUsage(AudioAttributes.USAGE_ALARM)
		.build();

		static {
		boolean onlyCoreApps;
		try {
		@@ -3699,7 +3688,7 @@ public class StatusBar extends SystemUI implements DemoMode,

		private void vibrateForCameraGesture() {
		// Make sure to pass -1 for repeat so VibratorService doesn't stop us when going to sleep.
		mVibrator.vibrate(mCameraLaunchGestureVibePattern, -1 /* repeat */, AUDIO_ATTRIBUTES);
		mVibrator.vibrate(mCameraLaunchGestureVibePattern, -1 /* repeat */);
		}

		/**