From df12b8abd7b4147ee908b7ba869cf1bef1605cd2 Mon Sep 17 00:00:00 2001 From: Cato the Cat Date: Mon, 23 Dec 2024 21:46:16 +0300 Subject: [PATCH] Remove vibrate function from barcode scanner --- .../com/github/barcodeeye/migrated/BeepManager.java | 11 +---------- .../com/github/barcodeeye/scan/CaptureActivity.java | 4 +--- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/github/barcodeeye/migrated/BeepManager.java b/app/src/main/java/com/github/barcodeeye/migrated/BeepManager.java index 047e1b1..8d5d379 100644 --- a/app/src/main/java/com/github/barcodeeye/migrated/BeepManager.java +++ b/app/src/main/java/com/github/barcodeeye/migrated/BeepManager.java @@ -21,7 +21,6 @@ import android.content.res.AssetFileDescriptor; import android.media.AudioManager; import android.media.MediaPlayer; -import android.os.Vibrator; import android.preference.PreferenceManager; import android.util.Log; @@ -37,12 +36,10 @@ public final class BeepManager implements MediaPlayer.OnCompletionListener, private static final String TAG = BeepManager.class.getSimpleName(); private static final float BEEP_VOLUME = 0.10f; - private static final long VIBRATE_DURATION = 200L; private final Activity activity; private MediaPlayer mediaPlayer; private boolean playBeep; - private boolean vibrate; public BeepManager(Activity activity) { this.activity = activity; @@ -54,7 +51,6 @@ public synchronized void updatePrefs() { SharedPreferences prefs = PreferenceManager .getDefaultSharedPreferences(activity); playBeep = shouldBeep(prefs, activity); - vibrate = false; if (playBeep && mediaPlayer == null) { // The volume on STREAM_SYSTEM is not adjustable, and users found it too loud, // so we now play on the music stream. @@ -63,15 +59,10 @@ public synchronized void updatePrefs() { } } - public synchronized void playBeepSoundAndVibrate() { + public synchronized void playBeepSound() { if (playBeep && mediaPlayer != null) { mediaPlayer.start(); } - if (vibrate) { - Vibrator vibrator = (Vibrator) activity - .getSystemService(Context.VIBRATOR_SERVICE); - vibrator.vibrate(VIBRATE_DURATION); - } } private static boolean shouldBeep(SharedPreferences prefs, Context activity) { diff --git a/app/src/main/java/com/github/barcodeeye/scan/CaptureActivity.java b/app/src/main/java/com/github/barcodeeye/scan/CaptureActivity.java index f102823..6b98a23 100755 --- a/app/src/main/java/com/github/barcodeeye/scan/CaptureActivity.java +++ b/app/src/main/java/com/github/barcodeeye/scan/CaptureActivity.java @@ -19,8 +19,6 @@ import java.util.Map; import android.app.AlertDialog; -import android.app.PendingIntent; -import android.app.PendingIntent.CanceledException; import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; @@ -247,7 +245,7 @@ public void handleDecode(Result rawResult, Bitmap barcode, float scaleFactor) { boolean fromLiveScan = barcode != null; if (fromLiveScan) { - mBeepManager.playBeepSoundAndVibrate(); + mBeepManager.playBeepSound(); drawResultPoints(barcode, scaleFactor, rawResult, getResources() .getColor(R.color.result_points)); }