Merge "Filtering null emissions from the long-press effect StateFlow." into main (4e2eb1b3) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/haptics/qs/QSLongPressEffectViewBinder.kt

+45 −52

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import com.android.app.tracing.coroutines.launch
		import com.android.systemui.lifecycle.repeatWhenAttached
		import com.android.systemui.qs.tileimpl.QSTileViewImpl
		import kotlinx.coroutines.DisposableHandle
		import kotlinx.coroutines.flow.filterNotNull

		object QSLongPressEffectViewBinder {

		@@ -49,9 +50,8 @@ object QSLongPressEffectViewBinder {
		launch({ "${tileSpec ?: "unknownTileSpec"}#LongPressEffect#action" }) {
		var effectAnimator: ValueAnimator? = null

		qsLongPressEffect.actionType.collect { action ->
		action?.let {
		when (it) {
		qsLongPressEffect.actionType.filterNotNull().collect { action ->
		when (action) {
		QSLongPressEffect.ActionType.CLICK -> {
		tile.performClick()
		qsLongPressEffect.clearActionType()
		@@ -74,9 +74,7 @@ object QSLongPressEffectViewBinder {
		qsLongPressEffect.effectDuration.toLong()
		interpolator = AccelerateDecelerateInterpolator()

		doOnStart {
		qsLongPressEffect.handleAnimationStart()
		}
		doOnStart { qsLongPressEffect.handleAnimationStart() }
		addUpdateListener {
		val value = animatedValue as Float
		if (value == 0f) {
		@@ -85,12 +83,8 @@ object QSLongPressEffectViewBinder {
		tile.updateLongPressEffectProperties(value)
		}
		}
		doOnEnd {
		qsLongPressEffect.handleAnimationComplete()
		}
		doOnCancel {
		qsLongPressEffect.handleAnimationCancel()
		}
		doOnEnd { qsLongPressEffect.handleAnimationComplete() }
		doOnCancel { qsLongPressEffect.handleAnimationCancel() }
		start()
		}
		}
		@@ -112,7 +106,6 @@ object QSLongPressEffectViewBinder {
		}
		}
		}
		}

		@SuppressLint("ClickableViewAccessibility")
		private fun setTouchListener(tile: QSTileViewImpl, longPressEffect: QSLongPressEffect?) {