[Android] Remove haptic feedback on brightness/volume sliders

Nicolas Pomepuy git at videolan.org
Tue Oct 6 10:58:46 CEST 2020


vlc-android | branch: 3.3.x | Nicolas Pomepuy <nicolas at videolabs.io> | Fri Sep 25 08:10:52 2020 +0200| [3268c8de059fcdd1cf28252ab7c0121b57546fcd] | committer: Nicolas Pomepuy

Remove haptic feedback on brightness/volume sliders

(cherry picked from commit 56b39c73288a31f8402a3091661875d49414b428)

> https://code.videolan.org/videolan/vlc-android/commit/3268c8de059fcdd1cf28252ab7c0121b57546fcd
---

 .../src/org/videolan/vlc/gui/video/VideoPlayerActivity.kt     |  1 -
 .../org/videolan/vlc/gui/video/VideoPlayerOverlayDelegate.kt  | 11 -----------
 2 files changed, 12 deletions(-)

diff --git a/application/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.kt b/application/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.kt
index e37ad413e..2153bcd63 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.kt
+++ b/application/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.kt
@@ -471,7 +471,6 @@ open class VideoPlayerActivity : AppCompatActivity(), PlaybackService.Callback,
 
         overlayDelegate.playToPause = AnimatedVectorDrawableCompat.create(this, R.drawable.anim_play_pause_video)!!
         overlayDelegate.pauseToPlay = AnimatedVectorDrawableCompat.create(this, R.drawable.anim_pause_play_video)!!
-        overlayDelegate.vibrator = getSystemService<Vibrator>()!!
     }
 
     override fun afterTextChanged(s: Editable?) {
diff --git a/application/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerOverlayDelegate.kt b/application/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerOverlayDelegate.kt
index 6f477bd6e..f32e0cc5b 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerOverlayDelegate.kt
+++ b/application/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerOverlayDelegate.kt
@@ -31,8 +31,6 @@ import android.content.Intent
 import android.content.pm.ActivityInfo
 import android.content.res.Configuration
 import android.os.Build
-import android.os.VibrationEffect
-import android.os.Vibrator
 import android.view.View
 import android.view.WindowManager
 import android.view.animation.AnimationUtils
@@ -94,7 +92,6 @@ class VideoPlayerOverlayDelegate (private val player: VideoPlayerActivity) {
     var info: TextView? = null
     var overlayInfo: View? = null
     lateinit var playerUiContainer:RelativeLayout
-    lateinit var vibrator: Vibrator
 
     lateinit var hudBinding: PlayerHudBinding
     lateinit var hudRightBinding: PlayerHudRightBinding
@@ -210,7 +207,6 @@ class VideoPlayerOverlayDelegate (private val player: VideoPlayerActivity) {
         playerOverlayBrightness = player.findViewById(R.id.player_overlay_brightness)
         brightnessValueText = player.findViewById(R.id.brightness_value_text)
         playerBrightnessProgress = player.findViewById(R.id.playerBrightnessProgress)
-        if (playerOverlayBrightness.visibility != View.VISIBLE) hapticFeedback()
         playerOverlayBrightness.setVisible()
         brightnessValueText.text = "$brightness%"
         playerBrightnessProgress.setValue(brightness)
@@ -230,7 +226,6 @@ class VideoPlayerOverlayDelegate (private val player: VideoPlayerActivity) {
         playerOverlayVolume = player.findViewById(R.id.player_overlay_volume)
         volumeValueText = player.findViewById(R.id.volume_value_text)
         playerVolumeProgress = player.findViewById(R.id.playerVolumeProgress)
-        if (playerOverlayVolume.visibility != View.VISIBLE && fromTouch)  hapticFeedback()
         volumeValueText.text = "$volume%"
         playerVolumeProgress.isDouble = player.isAudioBoostEnabled
         playerVolumeProgress.setValue(volume)
@@ -268,12 +263,6 @@ class VideoPlayerOverlayDelegate (private val player: VideoPlayerActivity) {
         player.window.decorView.systemUiVisibility = visibility
     }
 
-    @Suppress("DEPRECATION")
-    private fun hapticFeedback() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)  vibrator.vibrate(VibrationEffect.createOneShot(50, 80))
-        else vibrator.vibrate(50)
-    }
-
     /**
      * show overlay
      * @param forceCheck: adjust the timeout in function of playing state



More information about the Android mailing list