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

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

Merge "Fixes more @Nullable issues in System UI and WMShell." into udc-qpr-dev

parents 33b209c2 4d4b3b0b

libs/WindowManager/Shell/src/com/android/wm/shell/common/bubbles/BubblePopupDrawable.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -85,7 +85,7 @@ class BubblePopupDrawable(private val config: Config) : Drawable() { 
        canvas.drawPath(path, paint)

        canvas.drawPath(path, paint)

    }

    }





    override fun onBoundsChange(bounds: Rect?) {

    override fun onBoundsChange(bounds: Rect) {

        requestPathUpdate()

        requestPathUpdate()

    }

    }

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -311,7 +311,7 @@ class DesktopTasksController( 
        )

        )

        val wct = WindowContainerTransaction()

        val wct = WindowContainerTransaction()

        wct.setWindowingMode(task.token, WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW)

        wct.setWindowingMode(task.token, WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW)

        wct.setBounds(task.token, null)

        wct.setBounds(task.token, Rect())

        wct.setDensityDpi(task.token, getDefaultDensityDpi())

        wct.setDensityDpi(task.token, getDefaultDensityDpi())

        if (Transitions.ENABLE_SHELL_TRANSITIONS) {

        if (Transitions.ENABLE_SHELL_TRANSITIONS) {

            transitions.startTransition(TRANSIT_CHANGE, wct, null /* handler */)

            transitions.startTransition(TRANSIT_CHANGE, wct, null /* handler */)

packages/SystemUI/src/com/android/keyguard/ConnectedDisplayKeyguardPresentation.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -66,7 +66,7 @@ constructor( 
        window.isNavigationBarContrastEnforced = false

        window.isNavigationBarContrastEnforced = false

        window.navigationBarColor = Color.TRANSPARENT

        window.navigationBarColor = Color.TRANSPARENT





        clock = findViewById(R.id.clock)

        clock = requireViewById(R.id.clock)

        keyguardStatusViewController =

        keyguardStatusViewController =

            keyguardStatusViewComponentFactory.build(clock).keyguardStatusViewController.apply {

            keyguardStatusViewComponentFactory.build(clock).keyguardStatusViewController.apply {

                setDisplayedOnSecondaryDisplay()

                setDisplayedOnSecondaryDisplay()

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardSurfaceBehindParamsApplier.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -87,7 +87,7 @@ constructor( 
            }

            }

            addListener(

            addListener(

                object : AnimatorListenerAdapter() {

                object : AnimatorListenerAdapter() {

                    override fun onAnimationEnd(animation: Animator?) {

                    override fun onAnimationEnd(animation: Animator) {

                        updateIsAnimatingSurface()

                        updateIsAnimatingSurface()

                    }

                    }

                }

                }

packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -226,7 +226,7 @@ class UnlockedScreenOffAnimationController @Inject constructor( 
        val builder = InteractionJankMonitor.Configuration.Builder

        val builder = InteractionJankMonitor.Configuration.Builder

            .withView(

            .withView(

                    InteractionJankMonitor.CUJ_SCREEN_OFF_SHOW_AOD,

                    InteractionJankMonitor.CUJ_SCREEN_OFF_SHOW_AOD,

                    notifShadeWindowControllerLazy.get().windowRootView

                    checkNotNull(notifShadeWindowControllerLazy.get().windowRootView)

            )

            )

            .setTag(statusBarStateControllerImpl.getClockId())

            .setTag(statusBarStateControllerImpl.getClockId())