Merge "Removing haptics_for_compose_sliders flag." into main (6ee7692b) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -1372,16 +1372,6 @@ flag {
		}
		}

		flag {
		name: "haptics_for_compose_sliders"
		namespace: "systemui"
		description: "Adding haptic component infrastructure to sliders in Compose."
		bug: "341968766"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		namespace: "systemui"
		name: "settings_ext_register_content_observer_on_bg_thread"

+13 −17

Original line number	Diff line number	Diff line
		@@ -133,8 +133,7 @@ fun BrightnessSlider(
		val enabled = !isRestricted
		val contentDescription = stringResource(R.string.accessibility_brightness)
		val interactionSource = remember { MutableInteractionSource() }
		val hapticsViewModel: SliderHapticsViewModel? =
		if (Flags.hapticsForComposeSliders()) {
		val hapticsViewModel: SliderHapticsViewModel =
		rememberViewModel(traceName = "SliderHapticsViewModel") {
		hapticsViewModelFactory.create(
		interactionSource,
		@@ -146,9 +145,6 @@ fun BrightnessSlider(
		SeekableSliderTrackerConfig(),
		)
		}
		} else {
		null
		}
		val colors = colors()

		// The value state is recreated every time gammaValue changes, so we recreate this derivedState
		@@ -202,7 +198,7 @@ fun BrightnessSlider(
		onValueChange = {
		if (enabled) {
		if (!overriddenByAppState) {
		hapticsViewModel?.onValueChange(it)
		hapticsViewModel.onValueChange(it)
		value = it.toInt()
		onDrag(value)
		}
		@@ -211,7 +207,7 @@ fun BrightnessSlider(
		onValueChangeFinished = {
		if (enabled) {
		if (!overriddenByAppState) {
		hapticsViewModel?.onValueChangeEnded()
		hapticsViewModel.onValueChangeEnded()
		onStop(value)
		}
		}

+8 −17

Original line number	Diff line number	Diff line
		@@ -69,12 +69,7 @@ constructor(
		VolumeDialogSlider(
		viewModel = viewModel,
		overscrollViewModel = overscrollViewModel,
		hapticsViewModelFactory =
		if (com.android.systemui.Flags.hapticsForComposeSliders()) {
		hapticsViewModelFactory
		} else {
		null
		},
		hapticsViewModelFactory = hapticsViewModelFactory,
		)
		}
		}
		@@ -86,7 +81,7 @@ constructor(
		private fun VolumeDialogSlider(
		viewModel: VolumeDialogSliderViewModel,
		overscrollViewModel: VolumeDialogOverscrollViewModel,
		hapticsViewModelFactory: SliderHapticsViewModel.Factory?,
		hapticsViewModelFactory: SliderHapticsViewModel.Factory,
		modifier: Modifier = Modifier,
		) {
		val colors =
		@@ -128,16 +123,12 @@ private fun VolumeDialogSlider(
		colors = colors,
		interactionSource = interactionSource,
		haptics =
		hapticsViewModelFactory?.let {
		Haptics.Enabled(
		hapticsViewModelFactory = it,
		hapticsViewModelFactory = hapticsViewModelFactory,
		hapticConfigs =
		VolumeHapticsConfigsProvider.continuousConfigs(
		SliderHapticFeedbackFilter()
		),
		VolumeHapticsConfigsProvider.continuousConfigs(SliderHapticFeedbackFilter()),
		orientation = Orientation.Vertical,
		)
		} ?: Haptics.Disabled,
		),
		stepDistance = 1f,
		track = { sliderState ->
		SliderTrack(

+1 −2

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ package com.android.systemui.volume.panel.component.volume.slider.ui.viewmodel

		import android.content.Context
		import com.android.internal.logging.UiEventLogger
		import com.android.systemui.Flags
		import com.android.systemui.common.shared.model.Icon
		import com.android.systemui.dagger.qualifiers.UiBackground
		import com.android.systemui.haptics.slider.SliderHapticFeedbackFilter
		@@ -111,7 +110,7 @@ constructor(
		override fun toggleMuted(state: SliderState) {}

		override fun getSliderHapticsViewModelFactory(): SliderHapticsViewModel.Factory? =
		if (Flags.hapticsForComposeSliders() && slider.value != SliderState.Empty) {
		if (slider.value != SliderState.Empty) {
		hapticsViewModelFactory
		} else {
		null

+2 −6

Original line number	Diff line number	Diff line
		@@ -147,12 +147,8 @@ constructor(
		}
		}

		override fun getSliderHapticsViewModelFactory(): SliderHapticsViewModel.Factory? =
		if (Flags.hapticsForComposeSliders() && slider.value != SliderState.Empty) {
		override fun getSliderHapticsViewModelFactory(): SliderHapticsViewModel.Factory =
		hapticsViewModelFactory
		} else {
		null
		}

		private suspend fun AudioStreamModel.toState(
		isEnabled: Boolean,