Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Change attrbute of double-power-to-camera vibration"" into qt-dev

Browse Source 
am: 697989a615

Change-Id: I507f6a2fac875a1fcd47a73f49ff4e0950170b08
This commit is contained in:
Alexey Kuzmin
2019-06-14 07:21:21 -07:00
committed by android-build-merger
parent cea66dd3d0 697989a615
commit 03e64d649e
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -314,17 +314,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 {
@@ -3704,7 +3693,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 */);
}
/**