Merge "[TP] Fix carousel missing" into tm-qpr-dev (709d90a9) · Commits · e / os / android_packages_apps_ThemePicker

src/com/android/customization/picker/clock/ui/binder/ClockCarouselViewBinder.kt

+7 −5

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ object ClockCarouselViewBinder {

		@JvmStatic
		fun bind(
		view: ClockCarouselView,
		carouselView: ClockCarouselView,
		singleClockView: ViewGroup,
		viewModel: ClockCarouselViewModel,
		clockViewFactory: (clockId: String) -> View,
		@@ -50,11 +50,11 @@ object ClockCarouselViewBinder {
		singleClockView.requireViewById<FrameLayout>(R.id.single_clock_host_view)
		lifecycleOwner.lifecycleScope.launch {
		lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
		launch { viewModel.isCarouselVisible.collect { view.isVisible = it } }
		launch { viewModel.isCarouselVisible.collect { carouselView.isVisible = it } }

		launch {
		viewModel.allClockIds.collect { allClockIds ->
		view.setUpClockCarouselView(
		carouselView.setUpClockCarouselView(
		clockIds = allClockIds,
		onGetClockPreview = clockViewFactory,
		onClockSelected = { clockId -> viewModel.setSelectedClock(clockId) },
		@@ -64,11 +64,13 @@ object ClockCarouselViewBinder {

		launch {
		viewModel.selectedIndex.collect { selectedIndex ->
		view.setSelectedClockIndex(selectedIndex)
		carouselView.setSelectedClockIndex(selectedIndex)
		}
		}

		launch { viewModel.isSingleClockViewVisible.collect { view.isVisible = it } }
		launch {
		viewModel.isSingleClockViewVisible.collect { singleClockView.isVisible = it }
		}

		launch {
		viewModel.clockId.collect { clockId ->

+1 −1

Original line number	Diff line number	Diff line
		@@ -76,7 +76,7 @@ class PreviewWithClockCarouselSectionController(
		lifecycleOwner.lifecycleScope.launch {
		clockCarouselBinding =
		ClockCarouselViewBinder.bind(
		view = carouselView,
		carouselView = carouselView,
		singleClockView = singleClockView,
		viewModel = clockCarouselViewModel,
		clockViewFactory = { clockId -> clockViewFactory.getView(clockId) },