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

Commit 759f48e5 authored by Steve Elliott's avatar Steve Elliott Committed by Android (Google) Code Review
Browse files

Merge "Invoke SystemBarUtils#getStatusBarHeight in bg" into main

parents 4f10bd3f 78c9145c

packages/SystemUI/src/com/android/systemui/statusbar/ui/SystemBarUtilsState.kt

+13 −0
Original line number Diff line number Diff line
@@ -17,10 +17,16 @@ 
package com.android.systemui.statusbar.ui



import com.android.internal.policy.SystemBarUtils

import com.android.systemui.dagger.qualifiers.Background

import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.statusbar.policy.ConfigurationController

import com.android.systemui.statusbar.policy.onConfigChanged

import javax.inject.Inject

import kotlin.coroutines.CoroutineContext

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.conflate

import kotlinx.coroutines.flow.distinctUntilChanged

import kotlinx.coroutines.flow.flowOn

import kotlinx.coroutines.flow.map

import kotlinx.coroutines.flow.onStart
@@ -31,6 +37,8 @@ import kotlinx.coroutines.flow.onStart 
class SystemBarUtilsState

@Inject

constructor(

    @Background bgContext: CoroutineContext,

    @Main mainContext: CoroutineContext,

    configurationController: ConfigurationController,

    proxy: SystemBarUtilsProxy,

) {
@@ -38,5 +46,10 @@ constructor( 
    val statusBarHeight: Flow<Int> =

        configurationController.onConfigChanged

            .onStart<Any> { emit(Unit) }

            .flowOn(mainContext)

            .conflate()

            .map { proxy.getStatusBarHeight() }

            .distinctUntilChanged()

            .flowOn(bgContext)

            .conflate()

}

packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/ui/SystemBarUtilsStateKosmos.kt

+10 −2
Original line number Diff line number Diff line
@@ -17,7 +17,15 @@ 
package com.android.systemui.statusbar.ui



import com.android.systemui.kosmos.Kosmos

import com.android.systemui.kosmos.Kosmos.Fixture

import com.android.systemui.kosmos.testDispatcher

import com.android.systemui.statusbar.policy.configurationController



val Kosmos.systemBarUtilsState by

    Kosmos.Fixture { SystemBarUtilsState(configurationController, systemBarUtilsProxy) }
 
val Kosmos.systemBarUtilsState by Fixture {

    SystemBarUtilsState(

        testDispatcher,

        testDispatcher,

        configurationController,

        systemBarUtilsProxy,

    )

}