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

Merge "Remove enroll haptic feedback since it's now part of the framework."

Browse Source
This commit is contained in:
Jim Miller
2015-04-21 17:46:07 +00:00
committed by Android (Google) Code Review
parent 358e355942 97180e34a9
commit c225005b02
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/FingerprintEnroll.java
View File

@@ -31,7 +31,6 @@ import android.os.Bundle;
import android.os.CancellationSignal; import android.os.CancellationSignal;
import android.os.PowerManager; import android.os.PowerManager;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.Vibrator;
import android.hardware.fingerprint.FingerprintManager; import android.hardware.fingerprint.FingerprintManager;
import android.hardware.fingerprint.FingerprintManager.EnrollmentCallback; import android.hardware.fingerprint.FingerprintManager.EnrollmentCallback;
import android.util.Log; import android.util.Log;
@@ -101,7 +100,6 @@ public class FingerprintEnroll extends SettingsActivity {
private Stage mStage; private Stage mStage;
private int mEnrollmentSteps; private int mEnrollmentSteps;
private boolean mEnrolling; private boolean mEnrolling;
private Vibrator mVibrator;
private ProgressBar mProgressBar; private ProgressBar mProgressBar;
private ImageView mFingerprintAnimator; private ImageView mFingerprintAnimator;
private ObjectAnimator mProgressAnim; private ObjectAnimator mProgressAnim;
@@ -289,11 +287,6 @@ public class FingerprintEnroll extends SettingsActivity {
private void updateProgress(int progress) { private void updateProgress(int progress) {
if (DEBUG) Log.v(TAG, "Progress: " + progress); if (DEBUG) Log.v(TAG, "Progress: " + progress);
if (mVibrator != null) {
mVibrator.vibrate(100, new AudioAttributes.Builder()
.setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
.setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION).build());
}
if (mProgressAnim != null) { if (mProgressAnim != null) {
mProgressAnim.cancel(); mProgressAnim.cancel();
} }
@@ -367,7 +360,6 @@ public class FingerprintEnroll extends SettingsActivity {
final Activity activity = getActivity(); final Activity activity = getActivity();
mFingerprintManager = (FingerprintManager)activity mFingerprintManager = (FingerprintManager)activity
.getSystemService(Context.FINGERPRINT_SERVICE); .getSystemService(Context.FINGERPRINT_SERVICE);
mVibrator = (Vibrator) activity.getSystemService(Context.VIBRATOR_SERVICE);
mPowerManager = (PowerManager) activity.getSystemService(Context.POWER_SERVICE); mPowerManager = (PowerManager) activity.getSystemService(Context.POWER_SERVICE);
mContentView = inflater.inflate(R.layout.fingerprint_enroll, null); mContentView = inflater.inflate(R.layout.fingerprint_enroll, null);