From 95a15ab1220f3a91c551d13aae836d7ae92e3fcb Mon Sep 17 00:00:00 2001 From: Evan Laird Date: Tue, 11 Jul 2023 18:15:14 -0400 Subject: [PATCH] [Sb refactor] Remove debug color flags `NEW_STATUS_BAR_ICONS_DEBUG_COLORING` was implemented to help us distinguish the icons coming from the new pipeline vs the old one. Now that we are fully rolled out, we don't need this flag. Fixes: 260881289 Test: tests in com.android.systemui.statusbar.pipeline Test: manual Change-Id: Ia3691744e9d00fc41a041c4aaa032dce23cc6e22 --- .../src/com/android/systemui/flags/Flags.kt | 3 -- .../pipeline/StatusBarPipelineFlags.kt | 7 ---- .../mobile/ui/binder/MobileIconBinder.kt | 6 ---- .../viewmodel/LocationBasedMobileViewModel.kt | 28 ++------------- .../ui/viewmodel/MobileIconsViewModel.kt | 1 - .../pipeline/wifi/ui/WifiUiAdapter.kt | 5 +-- .../pipeline/wifi/ui/binder/WifiViewBinder.kt | 6 ---- .../viewmodel/LocationBasedWifiViewModel.kt | 36 +++++-------------- .../mobile/ui/MobileViewLoggerTest.kt | 10 +++--- .../ui/view/ModernStatusBarMobileViewTest.kt | 4 +-- .../LocationBasedMobileIconViewModelTest.kt | 6 ++-- .../ui/view/ModernStatusBarWifiViewTest.kt | 5 --- .../wifi/ui/viewmodel/WifiViewModelTest.kt | 18 ++++------ 13 files changed, 27 insertions(+), 108 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index add323983928f..0c13e702f0eaa 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -369,9 +369,6 @@ object Flags { val NEW_STATUS_BAR_MOBILE_ICONS_BACKEND = unreleasedFlag(608, "new_status_bar_mobile_icons_backend", teamfood = true) - // TODO(b/260881289): Tracking Bug - val NEW_STATUS_BAR_ICONS_DEBUG_COLORING = - unreleasedFlag(611, "new_status_bar_icons_debug_coloring") // TODO(b/265892345): Tracking Bug val PLUG_IN_STATUS_BAR_CHIP = releasedFlag(265892345, "plug_in_status_bar_chip") diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/StatusBarPipelineFlags.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/StatusBarPipelineFlags.kt index 29829e46cda71..4e48fcb26affa 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/StatusBarPipelineFlags.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/StatusBarPipelineFlags.kt @@ -45,13 +45,6 @@ constructor( fun runNewMobileIconsBackend(): Boolean = featureFlags.isEnabled(Flags.NEW_STATUS_BAR_MOBILE_ICONS_BACKEND) || useNewMobileIcons() - /** - * Returns true if we should apply some coloring to the icons that were rendered with the new - * pipeline to help with debugging. - */ - fun useDebugColoring(): Boolean = - featureFlags.isEnabled(Flags.NEW_STATUS_BAR_ICONS_DEBUG_COLORING) - /** * For convenience in the StatusBarIconController, we want to gate some actions based on slot * name and the flag together. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/binder/MobileIconBinder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/binder/MobileIconBinder.kt index a2a247a279fbe..c22110959fc1b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/binder/MobileIconBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/binder/MobileIconBinder.kt @@ -183,16 +183,10 @@ object MobileIconBinder { } override fun onIconTintChanged(newTint: Int) { - if (viewModel.useDebugColoring) { - return - } iconTint.value = newTint } override fun onDecorTintChanged(newTint: Int) { - if (viewModel.useDebugColoring) { - return - } decorTint.value = newTint } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/LocationBasedMobileViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/LocationBasedMobileViewModel.kt index f775940140cc0..a51982c41255b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/LocationBasedMobileViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/LocationBasedMobileViewModel.kt @@ -18,7 +18,6 @@ package com.android.systemui.statusbar.pipeline.mobile.ui.viewmodel import android.graphics.Color import com.android.systemui.statusbar.phone.StatusBarLocation -import com.android.systemui.statusbar.pipeline.StatusBarPipelineFlags import com.android.systemui.statusbar.pipeline.mobile.ui.VerboseMobileViewLogger /** @@ -32,24 +31,14 @@ import com.android.systemui.statusbar.pipeline.mobile.ui.VerboseMobileViewLogger */ abstract class LocationBasedMobileViewModel( val commonImpl: MobileIconViewModelCommon, - statusBarPipelineFlags: StatusBarPipelineFlags, - debugTint: Int, val locationName: String, val verboseLogger: VerboseMobileViewLogger?, ) : MobileIconViewModelCommon by commonImpl { - val useDebugColoring: Boolean = statusBarPipelineFlags.useDebugColoring() - - val defaultColor: Int = - if (useDebugColoring) { - debugTint - } else { - Color.WHITE - } + val defaultColor: Int = Color.WHITE companion object { fun viewModelForLocation( commonImpl: MobileIconViewModelCommon, - statusBarPipelineFlags: StatusBarPipelineFlags, verboseMobileViewLogger: VerboseMobileViewLogger, loc: StatusBarLocation, ): LocationBasedMobileViewModel = @@ -57,39 +46,31 @@ abstract class LocationBasedMobileViewModel( StatusBarLocation.HOME -> HomeMobileIconViewModel( commonImpl, - statusBarPipelineFlags, verboseMobileViewLogger, ) - StatusBarLocation.KEYGUARD -> - KeyguardMobileIconViewModel(commonImpl, statusBarPipelineFlags) - StatusBarLocation.QS -> QsMobileIconViewModel(commonImpl, statusBarPipelineFlags) + StatusBarLocation.KEYGUARD -> KeyguardMobileIconViewModel(commonImpl) + StatusBarLocation.QS -> QsMobileIconViewModel(commonImpl) } } } class HomeMobileIconViewModel( commonImpl: MobileIconViewModelCommon, - statusBarPipelineFlags: StatusBarPipelineFlags, verboseMobileViewLogger: VerboseMobileViewLogger, ) : MobileIconViewModelCommon, LocationBasedMobileViewModel( commonImpl, - statusBarPipelineFlags, - debugTint = Color.CYAN, locationName = "Home", verboseMobileViewLogger, ) class QsMobileIconViewModel( commonImpl: MobileIconViewModelCommon, - statusBarPipelineFlags: StatusBarPipelineFlags, ) : MobileIconViewModelCommon, LocationBasedMobileViewModel( commonImpl, - statusBarPipelineFlags, - debugTint = Color.GREEN, locationName = "QS", // Only do verbose logging for the Home location. verboseLogger = null, @@ -97,13 +78,10 @@ class QsMobileIconViewModel( class KeyguardMobileIconViewModel( commonImpl: MobileIconViewModelCommon, - statusBarPipelineFlags: StatusBarPipelineFlags, ) : MobileIconViewModelCommon, LocationBasedMobileViewModel( commonImpl, - statusBarPipelineFlags, - debugTint = Color.MAGENTA, locationName = "Keyguard", // Only do verbose logging for the Home location. verboseLogger = null, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconsViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconsViewModel.kt index 40b8c90fb9f5b..5cf887e4d41ac 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconsViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconsViewModel.kt @@ -98,7 +98,6 @@ constructor( val common = commonViewModelForSub(subId) return LocationBasedMobileViewModel.viewModelForLocation( common, - statusBarPipelineFlags, verboseLogger, location, ) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/WifiUiAdapter.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/WifiUiAdapter.kt index 6d7182376fab3..7a60d96d16619 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/WifiUiAdapter.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/WifiUiAdapter.kt @@ -23,7 +23,6 @@ import com.android.systemui.dagger.SysUISingleton import com.android.systemui.lifecycle.repeatWhenAttached import com.android.systemui.statusbar.phone.StatusBarIconController import com.android.systemui.statusbar.phone.StatusBarLocation -import com.android.systemui.statusbar.pipeline.StatusBarPipelineFlags import com.android.systemui.statusbar.pipeline.wifi.ui.model.WifiIcon import com.android.systemui.statusbar.pipeline.wifi.ui.viewmodel.LocationBasedWifiViewModel import com.android.systemui.statusbar.pipeline.wifi.ui.viewmodel.LocationBasedWifiViewModel.Companion.viewModelForLocation @@ -46,7 +45,6 @@ class WifiUiAdapter constructor( private val iconController: StatusBarIconController, private val wifiViewModel: WifiViewModel, - private val statusBarPipelineFlags: StatusBarPipelineFlags, ) { /** * Binds the container for all the status bar icons to a view model, so that we inflate the wifi @@ -60,8 +58,7 @@ constructor( statusBarIconGroup: ViewGroup, location: StatusBarLocation, ): LocationBasedWifiViewModel { - val locationViewModel = - viewModelForLocation(wifiViewModel, statusBarPipelineFlags, location) + val locationViewModel = viewModelForLocation(wifiViewModel, location) statusBarIconGroup.repeatWhenAttached { repeatOnLifecycle(Lifecycle.State.STARTED) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/binder/WifiViewBinder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/binder/WifiViewBinder.kt index e819c4fc96acf..3082a6629dc20 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/binder/WifiViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/binder/WifiViewBinder.kt @@ -157,16 +157,10 @@ object WifiViewBinder { } override fun onIconTintChanged(newTint: Int) { - if (viewModel.useDebugColoring) { - return - } iconTint.value = newTint } override fun onDecorTintChanged(newTint: Int) { - if (viewModel.useDebugColoring) { - return - } decorTint.value = newTint } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/LocationBasedWifiViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/LocationBasedWifiViewModel.kt index b731a41d442b5..cd5b92cf24c74 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/LocationBasedWifiViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/LocationBasedWifiViewModel.kt @@ -18,7 +18,6 @@ package com.android.systemui.statusbar.pipeline.wifi.ui.viewmodel import android.graphics.Color import com.android.systemui.statusbar.phone.StatusBarLocation -import com.android.systemui.statusbar.pipeline.StatusBarPipelineFlags /** * A view model for a wifi icon in a specific location. This allows us to control parameters that @@ -27,18 +26,9 @@ import com.android.systemui.statusbar.pipeline.StatusBarPipelineFlags * Must be subclassed for each distinct location. */ abstract class LocationBasedWifiViewModel( - val commonImpl: WifiViewModelCommon, - statusBarPipelineFlags: StatusBarPipelineFlags, - debugTint: Int, + private val commonImpl: WifiViewModelCommon, ) : WifiViewModelCommon by commonImpl { - val useDebugColoring: Boolean = statusBarPipelineFlags.useDebugColoring() - - val defaultColor: Int = - if (useDebugColoring) { - debugTint - } else { - Color.WHITE - } + val defaultColor: Int = Color.WHITE companion object { /** @@ -47,13 +37,12 @@ abstract class LocationBasedWifiViewModel( */ fun viewModelForLocation( commonImpl: WifiViewModelCommon, - flags: StatusBarPipelineFlags, location: StatusBarLocation, ): LocationBasedWifiViewModel = when (location) { - StatusBarLocation.HOME -> HomeWifiViewModel(commonImpl, flags) - StatusBarLocation.KEYGUARD -> KeyguardWifiViewModel(commonImpl, flags) - StatusBarLocation.QS -> QsWifiViewModel(commonImpl, flags) + StatusBarLocation.HOME -> HomeWifiViewModel(commonImpl) + StatusBarLocation.KEYGUARD -> KeyguardWifiViewModel(commonImpl) + StatusBarLocation.QS -> QsWifiViewModel(commonImpl) } } } @@ -64,23 +53,14 @@ abstract class LocationBasedWifiViewModel( */ class HomeWifiViewModel( commonImpl: WifiViewModelCommon, - statusBarPipelineFlags: StatusBarPipelineFlags, -) : - WifiViewModelCommon, - LocationBasedWifiViewModel(commonImpl, statusBarPipelineFlags, debugTint = Color.CYAN) +) : WifiViewModelCommon, LocationBasedWifiViewModel(commonImpl) /** A view model for the wifi icon shown on keyguard (lockscreen). */ class KeyguardWifiViewModel( commonImpl: WifiViewModelCommon, - statusBarPipelineFlags: StatusBarPipelineFlags, -) : - WifiViewModelCommon, - LocationBasedWifiViewModel(commonImpl, statusBarPipelineFlags, debugTint = Color.MAGENTA) +) : WifiViewModelCommon, LocationBasedWifiViewModel(commonImpl) /** A view model for the wifi icon shown in quick settings (when the shade is pulled down). */ class QsWifiViewModel( commonImpl: WifiViewModelCommon, - statusBarPipelineFlags: StatusBarPipelineFlags, -) : - WifiViewModelCommon, - LocationBasedWifiViewModel(commonImpl, statusBarPipelineFlags, debugTint = Color.GREEN) +) : WifiViewModelCommon, LocationBasedWifiViewModel(commonImpl) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/ui/MobileViewLoggerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/ui/MobileViewLoggerTest.kt index 4aa48d6f25f12..755aaa6541ff2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/ui/MobileViewLoggerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/ui/MobileViewLoggerTest.kt @@ -54,7 +54,7 @@ class MobileViewLoggerTest : SysuiTestCase() { @Test fun collectionStarted_dumpHasInfo() { val view = TextView(context) - val viewModel = QsMobileIconViewModel(commonViewModel, flags) + val viewModel = QsMobileIconViewModel(commonViewModel) underTest.logCollectionStarted(view, viewModel) @@ -66,8 +66,8 @@ class MobileViewLoggerTest : SysuiTestCase() { fun collectionStarted_multipleViews_dumpHasInfo() { val view = TextView(context) val view2 = TextView(context) - val viewModel = QsMobileIconViewModel(commonViewModel, flags) - val viewModel2 = KeyguardMobileIconViewModel(commonViewModel, flags) + val viewModel = QsMobileIconViewModel(commonViewModel) + val viewModel2 = KeyguardMobileIconViewModel(commonViewModel) underTest.logCollectionStarted(view, viewModel) underTest.logCollectionStarted(view2, viewModel2) @@ -81,8 +81,8 @@ class MobileViewLoggerTest : SysuiTestCase() { fun collectionStopped_dumpHasInfo() { val view = TextView(context) val view2 = TextView(context) - val viewModel = QsMobileIconViewModel(commonViewModel, flags) - val viewModel2 = KeyguardMobileIconViewModel(commonViewModel, flags) + val viewModel = QsMobileIconViewModel(commonViewModel) + val viewModel2 = KeyguardMobileIconViewModel(commonViewModel) underTest.logCollectionStarted(view, viewModel) underTest.logCollectionStarted(view2, viewModel2) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/ui/view/ModernStatusBarMobileViewTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/ui/view/ModernStatusBarMobileViewTest.kt index 7420db2e895ed..59fc0aceec97c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/ui/view/ModernStatusBarMobileViewTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/ui/view/ModernStatusBarMobileViewTest.kt @@ -235,7 +235,6 @@ class ModernStatusBarMobileViewTest : SysuiTestCase() { @Test fun onDarkChanged_iconHasNewColor() { - whenever(statusBarPipelineFlags.useDebugColoring()).thenReturn(false) val view = ModernStatusBarMobileView.constructAndBind( context, @@ -257,7 +256,6 @@ class ModernStatusBarMobileViewTest : SysuiTestCase() { @Test fun setStaticDrawableColor_iconHasNewColor() { - whenever(statusBarPipelineFlags.useDebugColoring()).thenReturn(false) val view = ModernStatusBarMobileView.constructAndBind( context, @@ -298,7 +296,7 @@ class ModernStatusBarMobileViewTest : SysuiTestCase() { constants, testScope.backgroundScope, ) - viewModel = QsMobileIconViewModel(viewModelCommon, statusBarPipelineFlags) + viewModel = QsMobileIconViewModel(viewModelCommon) } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/LocationBasedMobileIconViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/LocationBasedMobileIconViewModelTest.kt index d5fb5776b3444..e59d90f6bb66c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/LocationBasedMobileIconViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/LocationBasedMobileIconViewModelTest.kt @@ -86,9 +86,9 @@ class LocationBasedMobileIconViewModelTest : SysuiTestCase() { testScope.backgroundScope, ) - homeIcon = HomeMobileIconViewModel(commonImpl, statusBarPipelineFlags, mock()) - qsIcon = QsMobileIconViewModel(commonImpl, statusBarPipelineFlags) - keyguardIcon = KeyguardMobileIconViewModel(commonImpl, statusBarPipelineFlags) + homeIcon = HomeMobileIconViewModel(commonImpl, mock()) + qsIcon = QsMobileIconViewModel(commonImpl) + keyguardIcon = KeyguardMobileIconViewModel(commonImpl) } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/ui/view/ModernStatusBarWifiViewTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/ui/view/ModernStatusBarWifiViewTest.kt index 0d51af2754f05..b807f7795f41d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/ui/view/ModernStatusBarWifiViewTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/ui/view/ModernStatusBarWifiViewTest.kt @@ -31,7 +31,6 @@ import com.android.systemui.statusbar.StatusBarIconView.STATE_DOT import com.android.systemui.statusbar.StatusBarIconView.STATE_HIDDEN import com.android.systemui.statusbar.StatusBarIconView.STATE_ICON import com.android.systemui.statusbar.phone.StatusBarLocation -import com.android.systemui.statusbar.pipeline.StatusBarPipelineFlags import com.android.systemui.statusbar.pipeline.airplane.data.repository.FakeAirplaneModeRepository import com.android.systemui.statusbar.pipeline.airplane.domain.interactor.AirplaneModeInteractor import com.android.systemui.statusbar.pipeline.airplane.ui.viewmodel.AirplaneModeViewModel @@ -64,7 +63,6 @@ class ModernStatusBarWifiViewTest : SysuiTestCase() { private lateinit var testableLooper: TestableLooper - @Mock private lateinit var statusBarPipelineFlags: StatusBarPipelineFlags @Mock private lateinit var tableLogBuffer: TableLogBuffer @Mock private lateinit var connectivityConstants: ConnectivityConstants @Mock private lateinit var wifiConstants: WifiConstants @@ -110,7 +108,6 @@ class ModernStatusBarWifiViewTest : SysuiTestCase() { viewModel = viewModelForLocation( viewModelCommon, - statusBarPipelineFlags, StatusBarLocation.HOME, ) } @@ -199,7 +196,6 @@ class ModernStatusBarWifiViewTest : SysuiTestCase() { @Test fun onDarkChanged_iconHasNewColor() { - whenever(statusBarPipelineFlags.useDebugColoring()).thenReturn(false) val view = ModernStatusBarWifiView.constructAndBind(context, SLOT_NAME, viewModel) ViewUtils.attachView(view) testableLooper.processAllMessages() @@ -215,7 +211,6 @@ class ModernStatusBarWifiViewTest : SysuiTestCase() { @Test fun setStaticDrawableColor_iconHasNewColor() { - whenever(statusBarPipelineFlags.useDebugColoring()).thenReturn(false) val view = ModernStatusBarWifiView.constructAndBind(context, SLOT_NAME, viewModel) ViewUtils.attachView(view) testableLooper.processAllMessages() diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/WifiViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/WifiViewModelTest.kt index 0e303b2440941..cb469ead83cbe 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/WifiViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/WifiViewModelTest.kt @@ -20,7 +20,6 @@ import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.log.table.TableLogBuffer import com.android.systemui.statusbar.phone.StatusBarLocation -import com.android.systemui.statusbar.pipeline.StatusBarPipelineFlags import com.android.systemui.statusbar.pipeline.airplane.data.repository.FakeAirplaneModeRepository import com.android.systemui.statusbar.pipeline.airplane.domain.interactor.AirplaneModeInteractor import com.android.systemui.statusbar.pipeline.airplane.ui.viewmodel.AirplaneModeViewModel @@ -58,7 +57,6 @@ class WifiViewModelTest : SysuiTestCase() { private lateinit var underTest: WifiViewModel - @Mock private lateinit var statusBarPipelineFlags: StatusBarPipelineFlags @Mock private lateinit var tableLogBuffer: TableLogBuffer @Mock private lateinit var connectivityConstants: ConnectivityConstants @Mock private lateinit var wifiConstants: WifiConstants @@ -107,11 +105,9 @@ class WifiViewModelTest : SysuiTestCase() { @Test fun wifiIcon_allLocationViewModelsReceiveSameData() = runBlocking(IMMEDIATE) { - val home = - viewModelForLocation(underTest, statusBarPipelineFlags, StatusBarLocation.HOME) - val keyguard = - viewModelForLocation(underTest, statusBarPipelineFlags, StatusBarLocation.KEYGUARD) - val qs = viewModelForLocation(underTest, statusBarPipelineFlags, StatusBarLocation.QS) + val home = viewModelForLocation(underTest, StatusBarLocation.HOME) + val keyguard = viewModelForLocation(underTest, StatusBarLocation.KEYGUARD) + val qs = viewModelForLocation(underTest, StatusBarLocation.QS) var latestHome: WifiIcon? = null val jobHome = home.wifiIcon.onEach { latestHome = it }.launchIn(this) @@ -249,11 +245,9 @@ class WifiViewModelTest : SysuiTestCase() { createAndSetViewModel() wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK) - val home = - viewModelForLocation(underTest, statusBarPipelineFlags, StatusBarLocation.HOME) - val keyguard = - viewModelForLocation(underTest, statusBarPipelineFlags, StatusBarLocation.KEYGUARD) - val qs = viewModelForLocation(underTest, statusBarPipelineFlags, StatusBarLocation.QS) + val home = viewModelForLocation(underTest, StatusBarLocation.HOME) + val keyguard = viewModelForLocation(underTest, StatusBarLocation.KEYGUARD) + val qs = viewModelForLocation(underTest, StatusBarLocation.QS) var latestHome: Boolean? = null val jobHome = home.isActivityInViewVisible.onEach { latestHome = it }.launchIn(this)