commit c225005b02dd98bde9f360e5f544e1e820b418f3
author Jim Miller <jaggies@google.com> Tue Apr 21 17:46:07 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 21 17:46:11 2015 +0000
tree 01aaf4b6b92bd2261cf5fa0e94a2c1470a101412
parent 358e355942c97e4778830fd33c6c059c813dd220
parent 97180e34a9e65ddb4d8b6b0e318ad4979f978c85

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

src/com/android/settings/FingerprintEnroll.java

diff --git a/src/com/android/settings/FingerprintEnroll.java b/src/com/android/settings/FingerprintEnroll.java
index 8449a1f..c5ea7b4 100644
--- a/src/com/android/settings/FingerprintEnroll.java
+++ b/src/com/android/settings/FingerprintEnroll.java
@@ -31,7 +31,6 @@
 import android.os.CancellationSignal;
 import android.os.PowerManager;
 import android.os.SystemClock;
-import android.os.Vibrator;
 import android.hardware.fingerprint.FingerprintManager;
 import android.hardware.fingerprint.FingerprintManager.EnrollmentCallback;
 import android.util.Log;
@@ -101,7 +100,6 @@
         private Stage mStage;
         private int mEnrollmentSteps;
         private boolean mEnrolling;
-        private Vibrator mVibrator;
         private ProgressBar mProgressBar;
         private ImageView mFingerprintAnimator;
         private ObjectAnimator mProgressAnim;
@@ -289,11 +287,6 @@
 
         private void updateProgress(int 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) {
                 mProgressAnim.cancel();
             }
@@ -367,7 +360,6 @@
             final Activity activity = getActivity();
             mFingerprintManager = (FingerprintManager)activity
                     .getSystemService(Context.FINGERPRINT_SERVICE);
-            mVibrator = (Vibrator) activity.getSystemService(Context.VIBRATOR_SERVICE);
             mPowerManager = (PowerManager) activity.getSystemService(Context.POWER_SERVICE);
 
             mContentView = inflater.inflate(R.layout.fingerprint_enroll, null);