Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e2565a4 authored by Juan Sebastian Martinez's avatar Juan Sebastian Martinez
Browse files

Removing haptics_for_compose_sliders flag. 

This flag is now eligible for removal.

Test: presubmit
Flag: NONE flag removal
Bug: 409607167
Change-Id: I35a02d68372664f3c06f580164d5290de8c50bf6
parent 31cc60aa

packages/SystemUI/aconfig/systemui.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -1498,16 +1498,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"

packages/SystemUI/src/com/android/systemui/brightness/ui/compose/BrightnessSlider.kt

+13 −17
Original line number Diff line number Diff line
@@ -131,8 +131,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,
@@ -144,9 +143,6 @@ fun BrightnessSlider( 
                SeekableSliderTrackerConfig(),

            )

        }

        } else {

            null

        }

    val colors = colors()



    // The value state is recreated every time gammaValue changes, so we recreate this derivedState
@@ -193,7 +189,7 @@ fun BrightnessSlider( 
        onValueChange = {

            if (enabled) {

                if (!overriddenByAppState) {

                    hapticsViewModel?.onValueChange(it)

                    hapticsViewModel.onValueChange(it)

                    value = it.toInt()

                    onDrag(value)

                }
@@ -202,7 +198,7 @@ fun BrightnessSlider( 
        onValueChangeFinished = {

            if (enabled) {

                if (!overriddenByAppState) {

                    hapticsViewModel?.onValueChangeEnded()

                    hapticsViewModel.onValueChangeEnded()

                    onStop(value)

                }

            }

packages/SystemUI/src/com/android/systemui/volume/dialog/sliders/ui/VolumeDialogSliderViewBinder.kt

+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(

packages/SystemUI/src/com/android/systemui/volume/panel/component/volume/slider/ui/viewmodel/AudioSharingStreamSliderViewModel.kt

+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

packages/SystemUI/src/com/android/systemui/volume/panel/component/volume/slider/ui/viewmodel/AudioStreamSliderViewModel.kt

+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,