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

Commit efc9b9a1 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[Pod] Move util.kotlin.Flow.kt to a pod. 

Bug: 307607958
Flag: EXEMPT refactor
Test: m SystemUI-core

Change-Id: Ieb75bca29e494251fb9c82a2885d5a000b055932
parent 30e1d066

packages/SystemUI/pods/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ java_library { 
    static_libs: [

        "com.android.systemui.dagger-api",

        "com.android.systemui.retail-impl",

        "com.android.systemui.util.kotlin",

        "com.android.systemui.util.settings-api",

        "com.android.systemui.util.time-api",

        "com.android.systemui.util.time-impl",

packages/SystemUI/pods/com/android/systemui/util/kotlin/Android.bp

0 → 100644
+36 −0
Original line number Diff line number Diff line 
//

// Copyright (C) 2025 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.

//



package {

    default_applicable_licenses: ["frameworks_base_packages_SystemUI_license"],

}



java_library {

    name: "com.android.systemui.util.kotlin",

    srcs: [

        "*.kt",

    ],

    libs: ["//frameworks/libs/systemui:tracinglib-platform"],

    static_libs: [

        "com.android.systemui.util.time-api",

        "kotlin-stdlib",

        "kotlinx_coroutines",

    ],

    defaults: [

        "SystemUI_pod_defaults_api",

    ],

    kotlincflags: ["-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"],

}

packages/SystemUI/src/com/android/systemui/util/kotlin/Flow.kt→packages/SystemUI/pods/com/android/systemui/util/kotlin/Flow.kt

+31 −29
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ import kotlinx.coroutines.sync.withLock 
 *

 * Useful for code that needs to compare the current value to the previous value.

 */

fun <T, R> Flow<T>.pairwiseBy(transform: suspend (old: T, new: T) -> R): Flow<R> = flow {

public fun <T, R> Flow<T>.pairwiseBy(transform: suspend (old: T, new: T) -> R): Flow<R> = flow {

    val noVal = Any()

    var previousValue: Any? = noVal

    collect { newVal ->
@@ -62,7 +62,7 @@ fun <T, R> Flow<T>.pairwiseBy(transform: suspend (old: T, new: T) -> R): Flow<R> 
 *

 * Useful for code that needs to compare the current value to the previous value.

 */

fun <S, T : S, R> Flow<T>.pairwiseBy(

public fun <S, T : S, R> Flow<T>.pairwiseBy(

    initialValue: S,

    transform: suspend (previousValue: S, newValue: T) -> R,

): Flow<R> = pairwiseBy(getInitialValue = { initialValue }, transform)
@@ -76,7 +76,7 @@ fun <S, T : S, R> Flow<T>.pairwiseBy( 
 *

 * Useful for code that needs to compare the current value to the previous value.

 */

fun <S, T : S, R> Flow<T>.pairwiseBy(

public fun <S, T : S, R> Flow<T>.pairwiseBy(

    getInitialValue: suspend () -> S,

    transform: suspend (previousValue: S, newValue: T) -> R,

): Flow<R> = flow {
@@ -93,7 +93,7 @@ fun <S, T : S, R> Flow<T>.pairwiseBy( 
 *

 * Useful for code that needs to compare the current value to the previous value.

 */

fun <T> Flow<T>.pairwise(): Flow<WithPrev<T, T>> = pairwiseBy(::WithPrev)

public fun <T> Flow<T>.pairwise(): Flow<WithPrev<T, T>> = pairwiseBy(::WithPrev)



/**

 * Returns a new [Flow] that produces the two most recent emissions from [this]. [initialValue] will
@@ -101,14 +101,14 @@ fun <T> Flow<T>.pairwise(): Flow<WithPrev<T, T>> = pairwiseBy(::WithPrev) 
 *

 * Useful for code that needs to compare the current value to the previous value.

 */

fun <S, T : S> Flow<T>.pairwise(initialValue: S): Flow<WithPrev<S, T>> =

public fun <S, T : S> Flow<T>.pairwise(initialValue: S): Flow<WithPrev<S, T>> =

    pairwiseBy(initialValue, ::WithPrev)



/** Holds a [newValue] emitted from a [Flow], along with the [previousValue] emitted value. */

data class WithPrev<out S, out T : S>(val previousValue: S, val newValue: T)

public data class WithPrev<out S, out T : S>(val previousValue: S, val newValue: T)



/** Emits a [Unit] only when the number of downstream subscribers of this flow increases. */

fun <T> MutableSharedFlow<T>.onSubscriberAdded(): Flow<Unit> {

public fun <T> MutableSharedFlow<T>.onSubscriberAdded(): Flow<Unit> {

    return subscriptionCount

        .pairwise(initialValue = 0)

        .filter { (previous, current) -> current > previous }
@@ -126,7 +126,7 @@ fun <T> MutableSharedFlow<T>.onSubscriberAdded(): Flow<Unit> { 
 * If [emitFirstEvent] is `false`, then the first emission is ignored and no changes are emitted

 * until a second [Set] has been emitted from the upstream [Flow].

 */

fun <T, R> Flow<Set<T>>.setChangesBy(

public fun <T, R> Flow<Set<T>>.setChangesBy(

    transform: suspend (removed: Set<T>, added: Set<T>) -> R,

    emitFirstEvent: Boolean = true,

): Flow<R> =
@@ -150,11 +150,11 @@ fun <T, R> Flow<Set<T>>.setChangesBy( 
 * If [emitFirstEvent] is `false`, then the first emission is ignored and no changes are emitted

 * until a second [Set] has been emitted from the upstream [Flow].

 */

fun <T> Flow<Set<T>>.setChanges(emitFirstEvent: Boolean = true): Flow<SetChanges<T>> =

public fun <T> Flow<Set<T>>.setChanges(emitFirstEvent: Boolean = true): Flow<SetChanges<T>> =

    setChangesBy(::SetChanges, emitFirstEvent)



/** Contains the difference in elements between two [Set]s. */

data class SetChanges<T>(

public data class SetChanges<T>(

    /** Elements that are present in the first [Set] but not in the second. */

    val removed: Set<T>,

    /** Elements that are present in the second [Set] but not in the first. */
@@ -167,11 +167,13 @@ data class SetChanges<T>( 
 *

 * Note that the returned Flow will not emit anything until [other] has emitted at least one value.

 */

fun <A, B, C> Flow<A>.sample(other: Flow<B>, transform: suspend (A, B) -> C): Flow<C> = flow {

public fun <A, B, C> Flow<A>.sample(other: Flow<B>, transform: suspend (A, B) -> C): Flow<C> =

    flow {

        coroutineScope {

            val noVal = Any()

            val sampledRef = AtomicReference(noVal)

        val job = launch(context = Dispatchers.Unconfined) { other.collect { sampledRef.set(it) } }

            val job =

                launch(context = Dispatchers.Unconfined) { other.collect { sampledRef.set(it) } }

            collect {

                val sampled = sampledRef.get()

                if (sampled != noVal) {
@@ -188,7 +190,7 @@ fun <A, B, C> Flow<A>.sample(other: Flow<B>, transform: suspend (A, B) -> C): Fl 
 *

 * Note that the returned Flow will not emit anything until [other] has emitted at least one value.

 */

fun <A> Flow<*>.sample(other: Flow<A>): Flow<A> = sample(other) { _, a -> a }

public fun <A> Flow<*>.sample(other: Flow<A>): Flow<A> = sample(other) { _, a -> a }



/**

 * Returns a flow that mirrors the original flow, but delays values following emitted values for the
@@ -216,7 +218,7 @@ fun <A> Flow<*>.sample(other: Flow<A>): Flow<A> = sample(other) { _, a -> a } 
 * 1 (t=0ms), 3 (t=1000ms), 4 (t=2000ms), 5 (t=3000ms)

 * ```

 */

fun <T> Flow<T>.throttle(periodMs: Long, clock: SystemClock): Flow<T> = channelFlow {

public fun <T> Flow<T>.throttle(periodMs: Long, clock: SystemClock): Flow<T> = channelFlow {

    coroutineScope {

        var previousEmitTimeMs = 0L

        var delayJob: Job? = null
@@ -247,7 +249,7 @@ fun <T> Flow<T>.throttle(periodMs: Long, clock: SystemClock): Flow<T> = channelF 
    }

}



inline fun <T1, T2, T3, T4, T5, T6, R> combine(

public inline fun <T1, T2, T3, T4, T5, T6, R> combine(

    flow: Flow<T1>,

    flow2: Flow<T2>,

    flow3: Flow<T3>,
@@ -270,7 +272,7 @@ inline fun <T1, T2, T3, T4, T5, T6, R> combine( 
    }

}



inline fun <T1, T2, T3, T4, T5, T6, T7, R> combine(

public inline fun <T1, T2, T3, T4, T5, T6, T7, R> combine(

    flow: Flow<T1>,

    flow2: Flow<T2>,

    flow3: Flow<T3>,
@@ -295,7 +297,7 @@ inline fun <T1, T2, T3, T4, T5, T6, T7, R> combine( 
    }

}



inline fun <T1, T2, T3, T4, T5, T6, T7, T8, R> combine(

public inline fun <T1, T2, T3, T4, T5, T6, T7, T8, R> combine(

    flow: Flow<T1>,

    flow2: Flow<T2>,

    flow3: Flow<T3>,
@@ -322,7 +324,7 @@ inline fun <T1, T2, T3, T4, T5, T6, T7, T8, R> combine( 
    }

}



inline fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> combine(

public inline fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> combine(

    flow: Flow<T1>,

    flow2: Flow<T2>,

    flow3: Flow<T3>,
@@ -365,7 +367,7 @@ inline fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> combine( 
 * [Flow] as normal.

 */

@Suppress("NOTHING_TO_INLINE")

inline fun Flow<Unit>.emitOnStart(): Flow<Unit> = onStart { emit(Unit) }

public inline fun Flow<Unit>.emitOnStart(): Flow<Unit> = onStart { emit(Unit) }



/**

 * Transforms a Flow<T> into a Flow<List<T>> by implementing a sliding window algorithm.
@@ -382,7 +384,7 @@ inline fun Flow<Unit>.emitOnStart(): Flow<Unit> = onStart { emit(Unit) } 
 * @param windowDuration The duration of the sliding window.

 * @return A Flow that emits Lists of elements within the current sliding window.

 */

fun <T> Flow<T>.slidingWindow(windowDuration: Duration, clock: SystemClock): Flow<List<T>> =

public fun <T> Flow<T>.slidingWindow(windowDuration: Duration, clock: SystemClock): Flow<List<T>> =

    channelFlow {

        require(windowDuration.isPositive()) { "Window duration must be positive" }