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

Merge "Revert notification haptics to previous patterns" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-07-02 14:18:20 +00:00
committed by Android (Google) Code Review
parent c5aa20b947 fa3976990a
commit a0927a9a67
1 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
services/core/java/com/android/server/notification/VibratorHelper.java
View File

@@ -102,9 +102,6 @@ public final class VibratorHelper {
* @param insistent {@code true} if the vibration should loop until it is cancelled. * @param insistent {@code true} if the vibration should loop until it is cancelled.
*/ */
public VibrationEffect createFallbackVibration(boolean insistent) { public VibrationEffect createFallbackVibration(boolean insistent) {
if (mVibrator.hasFrequencyControl()) {
return createChirpVibration(insistent);
}
return createWaveformVibration(mFallbackPattern, insistent); return createWaveformVibration(mFallbackPattern, insistent);
} }
@@ -114,30 +111,9 @@ public final class VibratorHelper {
* @param insistent {@code true} if the vibration should loop until it is cancelled. * @param insistent {@code true} if the vibration should loop until it is cancelled.
*/ */
public VibrationEffect createDefaultVibration(boolean insistent) { public VibrationEffect createDefaultVibration(boolean insistent) {
if (mVibrator.hasFrequencyControl()) {
return createChirpVibration(insistent);
}
return createWaveformVibration(mDefaultPattern, insistent); return createWaveformVibration(mDefaultPattern, insistent);
} }
private static VibrationEffect createChirpVibration(boolean insistent) {
VibrationEffect.WaveformBuilder waveformBuilder = VibrationEffect.startWaveform()
.addStep(/* amplitude= */ 0, /* frequency= */ -0.85f, /* duration= */ 0)
.addRamp(/* amplitude= */ 1, /* frequency= */ -0.25f, /* duration= */ 100)
.addStep(/* amplitude= */ 1, /* duration= */ 150)
.addRamp(/* amplitude= */ 0, /* frequency= */ -0.85f, /* duration= */ 250);
if (insistent) {
return waveformBuilder.build(/* repeat= */ 0);
}
VibrationEffect singleBeat = waveformBuilder.build();
return VibrationEffect.startComposition()
.addEffect(singleBeat)
.addEffect(singleBeat)
.compose();
}
private static long[] getLongArray(Resources resources, int resId, int maxLength, long[] def) { private static long[] getLongArray(Resources resources, int resId, int maxLength, long[] def) {
int[] ar = resources.getIntArray(resId); int[] ar = resources.getIntArray(resId);
if (ar == null) { if (ar == null) {