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

Commit da7c919a authored by Hawkwood Glazier's avatar Hawkwood Glazier
Browse files

Migrate clock descriptions to plugins 

Bug: 287507746
Test: Checked accesibility functions of clock picking
Change-Id: Ie91b46addd22a5c2f700cc479c67b2eff147c384
parent 2b7e7da0

src/com/android/customization/module/CustomizationInjector.kt

+2 −3
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import com.android.customization.picker.clock.ui.view.ClockViewFactory 
import com.android.customization.picker.clock.ui.viewmodel.ClockCarouselViewModel

import com.android.customization.picker.clock.ui.viewmodel.ClockSectionViewModel

import com.android.customization.picker.clock.ui.viewmodel.ClockSettingsViewModel

import com.android.customization.picker.clock.utils.ClockDescriptionUtils

import com.android.customization.picker.color.domain.interactor.ColorPickerInteractor

import com.android.customization.picker.color.ui.viewmodel.ColorPickerViewModel

import com.android.customization.picker.quickaffordance.domain.interactor.KeyguardQuickAffordancePickerInteractor
@@ -58,6 +57,8 @@ interface CustomizationInjector : Injector { 


    fun getClockCarouselViewModelFactory(

        interactor: ClockPickerInteractor,

        clockViewFactory: ClockViewFactory,

        resources: Resources,

    ): ClockCarouselViewModel.Factory



    fun getClockViewFactory(activity: ComponentActivity): ClockViewFactory
@@ -67,6 +68,4 @@ interface CustomizationInjector : Injector { 
        wallpaperColorsRepository: WallpaperColorsRepository,

        clockViewFactory: ClockViewFactory,

    ): ClockSettingsViewModel.Factory



    fun getClockDescriptionUtils(resources: Resources): ClockDescriptionUtils

}

src/com/android/customization/module/ThemePickerInjector.kt

+6 −11
Original line number Diff line number Diff line
@@ -47,8 +47,6 @@ import com.android.customization.picker.clock.ui.view.ClockViewFactoryImpl 
import com.android.customization.picker.clock.ui.viewmodel.ClockCarouselViewModel

import com.android.customization.picker.clock.ui.viewmodel.ClockSectionViewModel

import com.android.customization.picker.clock.ui.viewmodel.ClockSettingsViewModel

import com.android.customization.picker.clock.utils.ClockDescriptionUtils

import com.android.customization.picker.clock.utils.ThemePickerClockDescriptionUtils

import com.android.customization.picker.color.data.repository.ColorPickerRepositoryImpl

import com.android.customization.picker.color.domain.interactor.ColorPickerInteractor

import com.android.customization.picker.color.domain.interactor.ColorPickerSnapshotRestorer
@@ -123,7 +121,6 @@ internal constructor( 
    private var themedIconSnapshotRestorer: ThemedIconSnapshotRestorer? = null

    private var themedIconInteractor: ThemedIconInteractor? = null

    private var clockSettingsViewModelFactory: ClockSettingsViewModel.Factory? = null

    private var clockDescriptionUtils: ClockDescriptionUtils? = null

    private var gridInteractor: GridInteractor? = null

    private var gridSnapshotRestorer: GridSnapshotRestorer? = null

    private var gridScreenViewModelFactory: GridScreenViewModel.Factory? = null
@@ -144,6 +141,8 @@ internal constructor( 
                    getFlags(),

                    getClockCarouselViewModelFactory(

                        getClockPickerInteractor(activity.applicationContext),

                        getClockViewFactory(activity),

                        resources = activity.resources,

                    ),

                    getClockViewFactory(activity),

                    getDarkModeSnapshotRestorer(activity),
@@ -364,11 +363,12 @@ internal constructor( 


    override fun getClockCarouselViewModelFactory(

        interactor: ClockPickerInteractor,

        clockViewFactory: ClockViewFactory,

        resources: Resources,

    ): ClockCarouselViewModel.Factory {

        return clockCarouselViewModelFactory

            ?: ClockCarouselViewModel.Factory(interactor, bgDispatcher).also {

                clockCarouselViewModelFactory = it

            }

            ?: ClockCarouselViewModel.Factory(interactor, bgDispatcher, clockViewFactory, resources)

                .also { clockCarouselViewModelFactory = it }

    }



    override fun getClockViewFactory(activity: ComponentActivity): ClockViewFactory {
@@ -509,11 +509,6 @@ internal constructor( 
                .also { clockSettingsViewModelFactory = it }

    }



    override fun getClockDescriptionUtils(resources: Resources): ClockDescriptionUtils {

        return clockDescriptionUtils

            ?: ThemePickerClockDescriptionUtils().also { clockDescriptionUtils = it }

    }



    fun getGridScreenViewModelFactory(

        context: Context,

    ): ViewModelProvider.Factory {

src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt

+0 −1
Original line number Diff line number Diff line
@@ -187,7 +187,6 @@ class ClockPickerRepositoryImpl( 
    ): ClockMetadataModel {

        return ClockMetadataModel(

            clockId = clockId,

            name = name,

            isSelected = isSelected,

            selectedColorId = selectedColorId,

            colorToneProgress = colorTone,

src/com/android/customization/picker/clock/shared/model/ClockMetadataModel.kt

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import androidx.annotation.IntRange 
/** Model for clock metadata. */

data class ClockMetadataModel(

    val clockId: String,

    val name: String,

    val isSelected: Boolean,

    val selectedColorId: String?,

    @IntRange(from = 0, to = 100) val colorToneProgress: Int,

src/com/android/customization/picker/clock/ui/view/ClockCarouselView.kt

+1 −1
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ class ClockCarouselView( 
    ) : Carousel.Adapter {



        fun getContentDescription(index: Int, resources: Resources): String {

            return clocks[index].getContentDescription(resources)

            return clocks[index].contentDescription

        }



        override fun count(): Int {