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

Commit 6a9f4051 authored by Lynn Yeh's avatar Lynn Yeh Committed by Android (Google) Code Review
Browse files

Merge "Update shade transition on full expand or collapse" into 24D1-dev

parents 3f2c73a9 e7791b85
Loading
Loading
Loading
Loading
+10 −2
Original line number Diff line number Diff line
@@ -460,8 +460,7 @@ constructor(
            object : StatusBarStateController.StateListener {
                override fun onStatePreChange(oldState: Int, newState: Int) {
                    // We're updating the location before the state change happens, since we want
                    // the
                    // location of the previous state to still be up to date when the animation
                    // the location of the previous state to still be up to date when the animation
                    // starts
                    if (
                        newState == StatusBarState.SHADE_LOCKED &&
@@ -566,6 +565,15 @@ constructor(
            }
        }

        coroutineScope.launch {
            shadeInteractor.shadeExpansion.collect { expansion ->
                if (expansion >= 1f || expansion <= 0f) {
                    // Shade has fully expanded or collapsed: force transition amount update
                    setTransitionToFullShadeAmount(expansion)
                }
            }
        }

        val settingsObserver: ContentObserver =
            object : ContentObserver(handler) {
                override fun onChange(selfChange: Boolean, uri: Uri?) {