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

Commit e29b15fd authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24516652



Change-Id: I5db2bdf32746b06404ab00f184fe8bce6ba120cc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d224a255 395c0b37

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

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

    }



    override fun onBoundsChange(bounds: Rect?) {

    override fun onBoundsChange(bounds: Rect) {

        requestPathUpdate()

    }

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

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

        val wct = WindowContainerTransaction()

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

        wct.setBounds(task.token, null)

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

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

        if (Transitions.ENABLE_SHELL_TRANSITIONS) {

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

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

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

        window.navigationBarColor = Color.TRANSPARENT



        clock = findViewById(R.id.clock)

        clock = requireViewById(R.id.clock)

        keyguardStatusViewController =

            keyguardStatusViewComponentFactory.build(clock).keyguardStatusViewController.apply {

                setDisplayedOnSecondaryDisplay()

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

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

            addListener(

                object : AnimatorListenerAdapter() {

                    override fun onAnimationEnd(animation: Animator?) {

                    override fun onAnimationEnd(animation: Animator) {

                        updateIsAnimatingSurface()

                    }

                }

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

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

            .withView(

                    InteractionJankMonitor.CUJ_SCREEN_OFF_SHOW_AOD,

                    notifShadeWindowControllerLazy.get().windowRootView

                    checkNotNull(notifShadeWindowControllerLazy.get().windowRootView)

            )

            .setTag(statusBarStateControllerImpl.getClockId())