Merge "Cleans up some uses of test scope and dispatcher" into main
diff --git a/src/com/android/customization/picker/clock/ui/binder/CarouselAccessibilityDelegate.kt b/src/com/android/customization/picker/clock/ui/binder/CarouselAccessibilityDelegate.kt
index 1026f19..5d6c3ff 100644
--- a/src/com/android/customization/picker/clock/ui/binder/CarouselAccessibilityDelegate.kt
+++ b/src/com/android/customization/picker/clock/ui/binder/CarouselAccessibilityDelegate.kt
@@ -37,6 +37,11 @@
override fun onInitializeAccessibilityNodeInfo(host: View, info: AccessibilityNodeInfo) {
super.onInitializeAccessibilityNodeInfo(host, info)
info.isScrollable = true
+
+ // for some reason this action is needed for the subsequent two action to appear in the
+ // accessibility action menu (this action doesn't show)
+ info.addAction(AccessibilityNodeInfo.ACTION_CLICK) // Standard click action
+
info.addAction(
AccessibilityNodeInfo.AccessibilityAction(
ACTION_SCROLL_FORWARD,
diff --git a/src/com/android/customization/picker/clock/ui/binder/ClockCarouselViewBinder.kt b/src/com/android/customization/picker/clock/ui/binder/ClockCarouselViewBinder.kt
index e2616c7..7fcfd9c 100644
--- a/src/com/android/customization/picker/clock/ui/binder/ClockCarouselViewBinder.kt
+++ b/src/com/android/customization/picker/clock/ui/binder/ClockCarouselViewBinder.kt
@@ -71,7 +71,7 @@
},
isTwoPaneAndSmallWidth = isTwoPaneAndSmallWidth,
)
- screenPreviewClickView.accessibilityDelegate = carouselAccessibilityDelegate
+ carouselView.accessibilityDelegate = carouselAccessibilityDelegate
screenPreviewClickView.setOnSideClickedListener { isStart ->
if (isStart) carouselView.scrollToPrevious()
else carouselView.scrollToNext()