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

Commit d260ccbc authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Fix kotlin nullable errors in ThemePicker am: 2d4a9f40 am: 73dcfe10 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/24393179



Change-Id: I1a1483263ffb7f8f5eee9222165e8466f960d84d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 587cdbf3 73dcfe10

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

+7 −7
Original line number Diff line number Diff line
@@ -34,28 +34,28 @@ class CarouselAccessibilityDelegate( 
    private val ACTION_SCROLL_BACKWARD = R.id.action_scroll_backward

    private val ACTION_SCROLL_FORWARD = R.id.action_scroll_forward



    override fun onInitializeAccessibilityNodeInfo(host: View?, info: AccessibilityNodeInfo?) {

    override fun onInitializeAccessibilityNodeInfo(host: View, info: AccessibilityNodeInfo) {

        super.onInitializeAccessibilityNodeInfo(host, info)

        info?.isScrollable = true

        info?.addAction(

        info.isScrollable = true

        info.addAction(

            AccessibilityNodeInfo.AccessibilityAction(

                ACTION_SCROLL_FORWARD,

                context.getString(R.string.scroll_forward_and_select)

            )

        )

        info?.addAction(

        info.addAction(

            AccessibilityNodeInfo.AccessibilityAction(

                ACTION_SCROLL_BACKWARD,

                context.getString(R.string.scroll_backward_and_select)

            )

        )

        info?.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_ACCESSIBILITY_FOCUS)

        info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_ACCESSIBILITY_FOCUS)

        // We need to specifically set the content description since for some reason the talkback

        // service does not go to children of the clock carousel in the view hierarchy

        info?.contentDescription = contentDescriptionOfSelectedClock

        info.contentDescription = contentDescriptionOfSelectedClock

    }



    override fun performAccessibilityAction(host: View?, action: Int, args: Bundle?): Boolean {

    override fun performAccessibilityAction(host: View, action: Int, args: Bundle?): Boolean {

        when (action) {

            ACTION_SCROLL_BACKWARD -> {

                scrollBackwardCallback.invoke()

src/com/android/customization/picker/color/ui/binder/ColorSectionViewBinder.kt

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ object ColorSectionViewBinder { 
                    viewModel = item.text,

                )

            }

            val optionSelectedView = itemView.findViewById<ImageView>(R.id.option_selected)

            val optionSelectedView = itemView.requireViewById<ImageView>(R.id.option_selected)



            lifecycleOwner.lifecycleScope.launch {

                lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {

src/com/android/customization/picker/color/ui/view/ColorOptionIconView.kt

+2 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ class ColorOptionIconView( 
        super.onSizeChanged(w, h, oldw, oldh)

    }



    override fun onDraw(canvas: Canvas?) {

    override fun onDraw(canvas: Canvas) {

        super.onDraw(canvas)

        // The w and h need to be an even number to avoid tiny pixel-level gaps between the pies

        w = w.roundDownToEven()
@@ -79,7 +79,7 @@ class ColorOptionIconView( 
        val height = h.toFloat()



        oval.set(0f, 0f, width, height)

        canvas?.apply {

        canvas.apply {

            paint.color = color3

            drawArc(

                oval,

src/com/android/customization/picker/preview/ui/section/PreviewWithClockCarouselSectionController.kt

+3 −3
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ class PreviewWithClockCarouselSectionController( 
        val view = super.createView(context, params)

        if (screen == CustomizationSections.Screen.LOCK_SCREEN) {

            val screenPreviewClickView: ScreenPreviewClickView =

                view.findViewById(R.id.screen_preview_click_view)

                view.requireViewById(R.id.screen_preview_click_view)

            val clockColorAndSizeButtonStub: ViewStub =

                view.requireViewById(R.id.clock_color_and_size_button)

            clockColorAndSizeButtonStub.layoutResource = R.layout.clock_color_and_size_button
@@ -164,7 +164,7 @@ class PreviewWithClockCarouselSectionController( 
            var bindJob: Job? = null

            onAttachStateChangeListener =

                object : OnAttachStateChangeListener {

                    override fun onViewAttachedToWindow(view: View?) {

                    override fun onViewAttachedToWindow(view: View) {

                        bindJob =

                            lifecycleOwner.lifecycleScope.launch {

                                ClockCarouselViewBinder.bind(
@@ -184,7 +184,7 @@ class PreviewWithClockCarouselSectionController( 
                            }

                    }



                    override fun onViewDetachedFromWindow(view: View?) {

                    override fun onViewDetachedFromWindow(view: View) {

                        bindJob?.cancel()

                    }

                }