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

Commit e7575789 authored by Tracy Zhou's avatar Tracy Zhou Committed by Android (Google) Code Review
Browse files

Merge "Fix non-null check crash" into main

parents 60379ac0 e22d4f7e

quickstep/src/com/android/launcher3/taskbar/navbutton/AbstractNavButtonLayoutter.kt

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ abstract class AbstractNavButtonLayoutter( 
        protected val imeSwitcher: ImageView?,

        protected val rotationButton: RotationButton?,

        protected val a11yButton: ImageView?,

        protected val space: Space

        protected val space: Space?

) : NavButtonLayoutter {

    protected val homeButton: ImageView? = navButtonContainer.findViewById(R.id.home)

    protected val recentsButton: ImageView? = navButtonContainer.findViewById(R.id.recent_apps)

quickstep/src/com/android/launcher3/taskbar/navbutton/KidsNavLayoutter.kt

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ class KidsNavLayoutter( 
        imeSwitcher: ImageView?,

        rotationButton: RotationButton?,

        a11yButton: ImageView?,

        space: Space,

        space: Space?

) :

    AbstractNavButtonLayoutter(

            resources,

quickstep/src/com/android/launcher3/taskbar/navbutton/NavButtonLayoutFactory.kt

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ class NavButtonLayoutFactory { 
                imeSwitcher: ImageView?,

                rotationButton: RotationButton?,

                a11yButton: ImageView?,

                space: Space,

                space: Space?,

                resources: Resources,

                isKidsMode: Boolean,

                isInSetup: Boolean,

quickstep/src/com/android/launcher3/taskbar/navbutton/PhoneGestureLayoutter.kt

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ class PhoneGestureLayoutter( 
        imeSwitcher: ImageView?,

        rotationButton: RotationButton?,

        a11yButton: ImageView?,

        space: Space,

        space: Space?

) :

        AbstractNavButtonLayoutter(

                resources,

quickstep/src/com/android/launcher3/taskbar/navbutton/PhoneLandscapeNavLayoutter.kt

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ open class PhoneLandscapeNavLayoutter( 
        imeSwitcher: ImageView?,

        rotationButton: RotationButton?,

        a11yButton: ImageView?,

        space: Space,

        space: Space?

) :

    AbstractNavButtonLayoutter(

            resources,