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

Commit 6f700cfc authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "[Unfold animation] Add a way to markScreenAsTurnedOn" into... 

Merge "Merge "[Unfold animation] Add a way to markScreenAsTurnedOn" into tm-qpr-dev am: c45f351a" into tm-qpr-dev-plus-aosp am: 68a616e1 am: dcafc7df

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



Change-Id: Ic1a4b4e42ce4213264704693eb19ea8ac4507efb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2d097af4 dcafc7df

packages/SystemUI/unfold/src/com/android/systemui/unfold/compat/ScreenSizeFoldProvider.kt

+12 −10
Original line number Diff line number Diff line
@@ -25,14 +25,18 @@ import java.util.concurrent.Executor 
 * It could be used when no activity context is available

 * TODO(b/232369816): use Jetpack WM library when non-activity contexts supported b/169740873

 */

class ScreenSizeFoldProvider(private val context: Context) : FoldProvider {

class ScreenSizeFoldProvider(context: Context) : FoldProvider {



    private var isFolded: Boolean = false

    private var callbacks: MutableList<FoldCallback> = arrayListOf()

    private var lastWidth: Int = 0



    init {

        onConfigurationChange(context.resources.configuration)

    }



    override fun registerCallback(callback: FoldCallback, executor: Executor) {

        callbacks += callback

        onConfigurationChange(context.resources.configuration)

        callback.onFoldUpdated(isFolded)

    }



    override fun unregisterCallback(callback: FoldCallback) {
@@ -40,16 +44,14 @@ class ScreenSizeFoldProvider(private val context: Context) : FoldProvider { 
    }



    fun onConfigurationChange(newConfig: Configuration) {

        if (lastWidth == newConfig.smallestScreenWidthDp) {

        val newIsFolded =

                newConfig.smallestScreenWidthDp < INNER_SCREEN_SMALLEST_SCREEN_WIDTH_THRESHOLD_DP

        if (newIsFolded == isFolded) {

            return

        }



        if (newConfig.smallestScreenWidthDp > INNER_SCREEN_SMALLEST_SCREEN_WIDTH_THRESHOLD_DP) {

            callbacks.forEach { it.onFoldUpdated(false) }

        } else {

            callbacks.forEach { it.onFoldUpdated(true) }

        }

        lastWidth = newConfig.smallestScreenWidthDp

        isFolded = newIsFolded

        callbacks.forEach { it.onFoldUpdated(isFolded) }

    }

}

packages/SystemUI/unfold/src/com/android/systemui/unfold/updates/DeviceFoldStateProvider.kt

+6 −0
Original line number Diff line number Diff line
@@ -256,6 +256,12 @@ constructor( 
            }

        }



        override fun markScreenAsTurnedOn() {

            if (!isFolded) {

                isUnfoldHandled = true

            }

        }



        override fun onScreenTurningOn() {

            isScreenOn = true

            updateHingeAngleProviderState()

packages/SystemUI/unfold/src/com/android/systemui/unfold/updates/screen/ScreenStatusProvider.kt

+7 −0
Original line number Diff line number Diff line
@@ -35,5 +35,12 @@ interface ScreenStatusProvider : CallbackController<ScreenListener> { 
         * Called when the screen is starting to be turned on.

         */

        fun onScreenTurningOn()



        /**

         * Called when the screen is already turned on but it happened before the creation

         * of the unfold progress provider, so we won't play the actual animation but we treat

         * the current state of the screen as 'turned on'

         */

        fun markScreenAsTurnedOn()

    }

}