commit 11b3add75c4d7718a2c5826e7c3d888975c0b900
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Jan 27 13:21:25 2025 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 27 13:21:25 2025 -0800
tree ad592cf34846f1092a022b879b15548dafc57a0c
parent e801cd88e15ea3657a93b8bdafad97c0963b5a92
parent 48b1b82b69e94b8576464bf977d42c216646ead9

Merge "Properly setting up haptics on IconView when MSDL is enabled." into main

quickstep/src/com/android/quickstep/views/IconView.kt

diff --git a/quickstep/src/com/android/quickstep/views/IconView.kt b/quickstep/src/com/android/quickstep/views/IconView.kt
index 2e6c4bf..6da52d6 100644
--- a/quickstep/src/com/android/quickstep/views/IconView.kt
+++ b/quickstep/src/com/android/quickstep/views/IconView.kt
@@ -45,11 +45,11 @@
     private var msdlPlayerWrapper: MSDLPlayerWrapper? = null
 
     constructor(context: Context) : super(context) {
-        msdlPlayerWrapper = MSDLPlayerWrapper.INSTANCE.get(context)
+        setUpHaptics()
     }
 
     constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {
-        msdlPlayerWrapper = MSDLPlayerWrapper.INSTANCE.get(context)
+        setUpHaptics()
     }
 
     constructor(
@@ -57,11 +57,15 @@
         attrs: AttributeSet?,
         defStyleAttr: Int,
     ) : super(context, attrs, defStyleAttr) {
-        msdlPlayerWrapper = MSDLPlayerWrapper.INSTANCE.get(context)
+        setUpHaptics()
     }
 
     init {
         multiValueAlpha.setUpdateVisibility(true)
+    }
+
+    private fun setUpHaptics() {
+        msdlPlayerWrapper = MSDLPlayerWrapper.INSTANCE.get(context)
         // Haptics are handled by the MSDLPlayerWrapper
         isHapticFeedbackEnabled = !Flags.msdlFeedback() || msdlPlayerWrapper == null
     }