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

Commit 2e7b5156 authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Automerger Merge Worker
Browse files

Merge "Subsequent blind fix for runBlocking Interrupted Exceptions" into...

Merge "Subsequent blind fix for runBlocking Interrupted Exceptions" into udc-dev am: f175ad01 am: 3322203f

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



Change-Id: I01ef2cfe5dd3b70e50d565c0589dc1e3e32f52fd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 52b3c398 3322203f
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.content.IntentFilter
import android.graphics.Rect
import android.hardware.display.DisplayManager
import android.os.Bundle
import android.os.Handler
import android.os.IBinder
import android.view.LayoutInflater
import android.view.SurfaceControlViewHost
@@ -58,6 +59,7 @@ class KeyguardPreviewRenderer
constructor(
    @Application private val context: Context,
    @Main private val mainDispatcher: CoroutineDispatcher,
    @Main private val mainHandler: Handler,
    private val bottomAreaViewModel: KeyguardBottomAreaViewModel,
    displayManager: DisplayManager,
    private val windowManager: WindowManager,
@@ -113,7 +115,7 @@ constructor(
    }

    fun render() {
        runBlocking(mainDispatcher) {
        mainHandler.post {
            val rootView = FrameLayout(context)

            setUpBottomArea(rootView)
@@ -169,14 +171,12 @@ constructor(
     * @param hide TRUE hides smartspace, FALSE shows smartspace
     */
    fun hideSmartspace(hide: Boolean) {
        runBlocking(mainDispatcher) {
            smartSpaceView?.visibility = if (hide) View.INVISIBLE else View.VISIBLE
        }
        mainHandler.post { smartSpaceView?.visibility = if (hide) View.INVISIBLE else View.VISIBLE }
    }

    /** Sets the clock's color to the overridden seed color. */
    fun onColorOverridden(@ColorInt color: Int?) {
        runBlocking(mainDispatcher) {
        mainHandler.post {
            colorOverride = color
            clockController.clock?.run { events.onSeedColorChanged(color) }
        }