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

Commit 51d998c2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use change listener instead of touch when using accessibility" into main

parents 9a0e1a00 3c2a3f35

src/com/android/wallpaper/customization/ui/binder/ClockFloatingSheetBinder.kt

+11 −3
Original line number Diff line number Diff line
@@ -471,12 +471,20 @@ object ClockFloatingSheetBinder { 
                                override fun onStartTrackingTouch(slider: Slider) {}



                                override fun onStopTrackingTouch(slider: Slider) {

                                    if (!optionsViewModel.isAccessibilityEnabled(slider.context)) {

                                        axisPresetsSliderViewModel.onSliderStopTrackingTouch(

                                            slider.value

                                        )

                                    }

                                }

                            }

                        )

                        axisPresetSlider.clearOnChangeListeners()

                        axisPresetSlider.addOnChangeListener { slider, value, fromUser ->

                            if (optionsViewModel.isAccessibilityEnabled(slider.context)) {

                                axisPresetsSliderViewModel.onSliderStopTrackingTouch(value)

                            }

                        }

                    }

                }

src/com/android/wallpaper/customization/ui/viewmodel/ThemePickerCustomizationOptionsViewModel.kt

+9 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.wallpaper.customization.ui.viewmodel



import android.content.Context

import android.view.accessibility.AccessibilityManager

import com.android.customization.picker.mode.ui.viewmodel.DarkModeViewModel

import com.android.wallpaper.customization.ui.util.ThemePickerCustomizationOptionUtil

import com.android.wallpaper.picker.customization.ui.view.ApplyButton
@@ -26,6 +28,7 @@ import com.android.wallpaper.picker.customization.ui.viewmodel.CustomizationOpti 
import com.android.wallpaper.picker.customization.ui.viewmodel.CustomizationOptionsViewModel

import com.android.wallpaper.picker.customization.ui.viewmodel.CustomizationOptionsViewModelFactory

import com.android.wallpaper.picker.customization.ui.viewmodel.DefaultCustomizationOptionsViewModel

import com.android.wallpaper.picker.preview.ui.util.AccessibilityUtil

import dagger.assisted.Assisted

import dagger.assisted.AssistedFactory

import dagger.assisted.AssistedInject
@@ -270,6 +273,12 @@ constructor( 


    val isApplyButtonVisible: Flow<Boolean> = selectedOption.map { it != null }



    fun isAccessibilityEnabled(context: Context): Boolean {

        return AccessibilityUtil.isAccessibilityEnabled(

            context.getSystemService(Context.ACCESSIBILITY_SERVICE) as AccessibilityManager

        )

    }



    @ViewModelScoped

    @AssistedFactory

    interface Factory : CustomizationOptionsViewModelFactory {