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

Commit 0a03dbd5 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Automerger Merge Worker
Browse files

Merge "[SB Refactor] Convert the WifiViewModel.wifiIcon tests to a... 

Merge "[SB Refactor] Convert the WifiViewModel.wifiIcon tests to a parameterized test file to make all the possibilities clearer." into tm-qpr-dev am: 1619a054 am: 226c9c64

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



Change-Id: I6271a4e5fe8145f2376d15643a296ae109258f62
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7ba35eea 226c9c64

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/HomeWifiViewModel.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ import kotlinx.coroutines.flow.StateFlow 
 */

 */

class HomeWifiViewModel(

class HomeWifiViewModel(

    statusBarPipelineFlags: StatusBarPipelineFlags,

    statusBarPipelineFlags: StatusBarPipelineFlags,

    wifiIcon: StateFlow<Icon?>,

    wifiIcon: StateFlow<Icon.Resource?>,

    isActivityInViewVisible: Flow<Boolean>,

    isActivityInViewVisible: Flow<Boolean>,

    isActivityOutViewVisible: Flow<Boolean>,

    isActivityOutViewVisible: Flow<Boolean>,

    isActivityContainerVisible: Flow<Boolean>,

    isActivityContainerVisible: Flow<Boolean>,

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/KeyguardWifiViewModel.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ import kotlinx.coroutines.flow.StateFlow 
/** A view model for the wifi icon shown on keyguard (lockscreen). */

/** A view model for the wifi icon shown on keyguard (lockscreen). */

class KeyguardWifiViewModel(

class KeyguardWifiViewModel(

    statusBarPipelineFlags: StatusBarPipelineFlags,

    statusBarPipelineFlags: StatusBarPipelineFlags,

    wifiIcon: StateFlow<Icon?>,

    wifiIcon: StateFlow<Icon.Resource?>,

    isActivityInViewVisible: Flow<Boolean>,

    isActivityInViewVisible: Flow<Boolean>,

    isActivityOutViewVisible: Flow<Boolean>,

    isActivityOutViewVisible: Flow<Boolean>,

    isActivityContainerVisible: Flow<Boolean>,

    isActivityContainerVisible: Flow<Boolean>,

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/LocationBasedWifiViewModel.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -34,7 +34,7 @@ abstract class LocationBasedWifiViewModel( 
    debugTint: Int,

    debugTint: Int,





    /** The wifi icon that should be displayed. Null if we shouldn't display any icon. */

    /** The wifi icon that should be displayed. Null if we shouldn't display any icon. */

    val wifiIcon: StateFlow<Icon?>,

    val wifiIcon: StateFlow<Icon.Resource?>,





    /** True if the activity in view should be visible. */

    /** True if the activity in view should be visible. */

    val isActivityInViewVisible: Flow<Boolean>,

    val isActivityInViewVisible: Flow<Boolean>,

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/QsWifiViewModel.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ import kotlinx.coroutines.flow.StateFlow 
/** A view model for the wifi icon shown in quick settings (when the shade is pulled down). */

/** A view model for the wifi icon shown in quick settings (when the shade is pulled down). */

class QsWifiViewModel(

class QsWifiViewModel(

    statusBarPipelineFlags: StatusBarPipelineFlags,

    statusBarPipelineFlags: StatusBarPipelineFlags,

    wifiIcon: StateFlow<Icon?>,

    wifiIcon: StateFlow<Icon.Resource?>,

    isActivityInViewVisible: Flow<Boolean>,

    isActivityInViewVisible: Flow<Boolean>,

    isActivityOutViewVisible: Flow<Boolean>,

    isActivityOutViewVisible: Flow<Boolean>,

    isActivityContainerVisible: Flow<Boolean>,

    isActivityContainerVisible: Flow<Boolean>,

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/WifiViewModel.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -121,7 +121,7 @@ constructor( 
    }

    }





    /** The wifi icon that should be displayed. Null if we shouldn't display any icon. */

    /** The wifi icon that should be displayed. Null if we shouldn't display any icon. */

    private val wifiIcon: StateFlow<Icon?> =

    private val wifiIcon: StateFlow<Icon.Resource?> =

        combine(

        combine(

            interactor.isEnabled,

            interactor.isEnabled,

            interactor.isForceHidden,

            interactor.isForceHidden,