PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fingerprint enrollment vibrate unchanged by dnd" into pi-dev

Browse Source 
am: a2f2371224

Change-Id: I197a877a4a9a886b0238b7b43138fffda62d0563
This commit is contained in:
Beverly
2018-03-21 21:13:01 +00:00
committed by android-build-merger
parent 8e3868e4fe a2f2371224
commit 5ac189038a
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
View File

@@ -30,6 +30,7 @@ import android.graphics.drawable.AnimatedVectorDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable; import android.graphics.drawable.LayerDrawable;
import android.hardware.fingerprint.FingerprintManager; import android.hardware.fingerprint.FingerprintManager;
import android.media.AudioAttributes;
import android.os.Bundle; import android.os.Bundle;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.VibrationEffect; import android.os.VibrationEffect;
@@ -78,6 +79,11 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase
private static final VibrationEffect VIBRATE_EFFECT_ERROR = private static final VibrationEffect VIBRATE_EFFECT_ERROR =
VibrationEffect.createWaveform(new long[] {0, 5, 55, 60}, -1); VibrationEffect.createWaveform(new long[] {0, 5, 55, 60}, -1);
private static final AudioAttributes FINGERPRINT_ENROLLING_SONFICATION_ATTRIBUTES =
new AudioAttributes.Builder()
.setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
.setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION)
.build();
private ProgressBar mProgressBar; private ProgressBar mProgressBar;
private ObjectAnimator mProgressAnim; private ObjectAnimator mProgressAnim;
@@ -376,7 +382,7 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase
mErrorText.setTranslationY(0f); mErrorText.setTranslationY(0f);
} }
if (isResumed()) { if (isResumed()) {
mVibrator.vibrate(VIBRATE_EFFECT_ERROR); mVibrator.vibrate(VIBRATE_EFFECT_ERROR, FINGERPRINT_ENROLLING_SONFICATION_ATTRIBUTES);
} }
} }