Merge "Merge "Create TEST_OWNERS for SystemUI" into main am: 9bdd3f4ee6 am: ad1e84a2ff" into main
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/DreamOverlayServiceTest.kt b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.kt
similarity index 95%
rename from packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/DreamOverlayServiceTest.kt
rename to packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.kt
index 7dd7174..a3314e8 100644
--- a/packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/DreamOverlayServiceTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.kt
@@ -185,7 +185,7 @@
dreamsComplicationComponent,
dreamOverlayComponent,
complicationComponent,
- ambientTouchComponent
+ ambientTouchComponent,
)
}
@@ -194,7 +194,7 @@
dreamsComplicationComponent,
dreamOverlayComponent,
complicationComponent,
- ambientTouchComponent
+ ambientTouchComponent,
)
}
}
@@ -204,7 +204,7 @@
com.android.systemui.dreams.complication.dagger.ComplicationComponent.Factory,
dreamOverlayComponentFactory: DreamOverlayComponent.Factory,
complicationComponentFactory: ComplicationComponent.Factory,
- ambientTouchComponentFactory: AmbientTouchComponent.Factory
+ ambientTouchComponentFactory: AmbientTouchComponent.Factory,
): EnvironmentComponents {
val dreamOverlayComponent = mock<DreamOverlayComponent>()
whenever(dreamOverlayComponent.getDreamOverlayContainerViewController())
@@ -241,7 +241,7 @@
dreamComplicationComponent,
dreamOverlayComponent,
complicationComponent,
- ambientTouchComponent
+ ambientTouchComponent,
)
}
@@ -259,7 +259,7 @@
mDreamComplicationComponentFactory,
mDreamOverlayComponentFactory,
mComplicationComponentFactory,
- mAmbientTouchComponentFactory
+ mAmbientTouchComponentFactory,
)
whenever(mDreamOverlayContainerViewController.containerView)
@@ -271,7 +271,7 @@
ViewCaptureAwareWindowManager(
mWindowManager,
mLazyViewCapture,
- isViewCaptureEnabled = false
+ isViewCaptureEnabled = false,
)
mService =
DreamOverlayService(
@@ -295,7 +295,7 @@
mDreamOverlayCallbackController,
kosmos.keyguardInteractor,
gestureInteractor,
- WINDOW_NAME
+ WINDOW_NAME,
)
}
@@ -323,7 +323,7 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
false /*isPreview*/,
- false /*shouldShowComplication*/
+ false, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
verify(mUiEventLogger).log(DreamOverlayService.DreamOverlayEvent.DREAM_OVERLAY_ENTER_START)
@@ -341,7 +341,7 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
false /*isPreview*/,
- false /*shouldShowComplication*/
+ false, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
verify(mWindowManager).addView(any(), any())
@@ -361,7 +361,7 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
false /*isPreview*/,
- false /*shouldShowComplication*/
+ false, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
verify(mWindowManager).addView(any(), any())
@@ -384,7 +384,7 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
false /*isPreview*/,
- false /*shouldShowComplication*/
+ false, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
verify(mDreamOverlayContainerViewController).init()
@@ -403,7 +403,7 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
false /*isPreview*/,
- false /*shouldShowComplication*/
+ false, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
verify(mDreamOverlayContainerViewParent).removeView(mDreamOverlayContainerView)
@@ -419,7 +419,7 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
false /*isPreview*/,
- true /*shouldShowComplication*/
+ true, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
assertThat(mService.shouldShowComplications()).isTrue()
@@ -435,7 +435,7 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
false /*isPreview*/,
- true /*shouldShowComplication*/
+ true, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
@@ -448,7 +448,7 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
false /*isPreview*/,
- true /*shouldShowComplication*/
+ true, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
@@ -476,7 +476,7 @@
mDreamOverlayCallback,
LOW_LIGHT_COMPONENT.flattenToString(),
false /*isPreview*/,
- false /*shouldShowComplication*/
+ false, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
assertThat(mService.dreamComponent).isEqualTo(LOW_LIGHT_COMPONENT)
@@ -493,7 +493,7 @@
mDreamOverlayCallback,
HOME_CONTROL_PANEL_DREAM_COMPONENT.flattenToString(),
false /*isPreview*/,
- false /*shouldShowComplication*/
+ false, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
assertThat(mService.dreamComponent).isEqualTo(HOME_CONTROL_PANEL_DREAM_COMPONENT)
@@ -510,7 +510,7 @@
mDreamOverlayCallback,
LOW_LIGHT_COMPONENT.flattenToString(),
false /*isPreview*/,
- false /*shouldShowComplication*/
+ false, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
@@ -545,7 +545,7 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
false /*isPreview*/,
- false /*shouldShowComplication*/
+ false, /*shouldShowComplication*/
)
// Immediately end the dream.
client.endDream()
@@ -577,7 +577,7 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
false /*isPreview*/,
- false /*shouldShowComplication*/
+ false, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
@@ -597,7 +597,7 @@
mDreamOverlayCallback,
LOW_LIGHT_COMPONENT.flattenToString(),
false /*isPreview*/,
- false /*shouldShowComplication*/
+ false, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
@@ -649,7 +649,7 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
false /*isPreview*/,
- false /*shouldShowComplication*/
+ false, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
verify(mWindowManager, Mockito.never()).addView(any(), any())
@@ -673,7 +673,7 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
false /*isPreview*/,
- false /*shouldShowComplication*/
+ false, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
@@ -694,7 +694,7 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
false /*isPreview*/,
- true /*shouldShowComplication*/
+ true, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
@@ -724,7 +724,7 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
false /*isPreview*/,
- true /*shouldShowComplication*/
+ true, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
mService.onWakeUp()
@@ -748,7 +748,7 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
false /*isPreview*/,
- false /*shouldShowComplication*/
+ false, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
val paramsCaptor = ArgumentCaptor.forClass(WindowManager.LayoutParams::class.java)
@@ -774,7 +774,7 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
false /*isPreview*/,
- false /*shouldShowComplication*/
+ false, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
@@ -800,7 +800,7 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
false /*isPreview*/,
- false /*shouldShowComplication*/
+ false, /*shouldShowComplication*/
)
// Set communal available, verify that overlay callback is informed.
kosmos.setCommunalAvailable(true)
@@ -829,7 +829,7 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
false /*isPreview*/,
- true /*shouldShowComplication*/
+ true, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
@@ -850,7 +850,7 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
false /*isPreview*/,
- true /*shouldShowComplication*/
+ true, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
@@ -870,7 +870,7 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
false /*isPreview*/,
- true /*shouldShowComplication*/
+ true, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
@@ -894,14 +894,14 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
false /*isPreview*/,
- false /*shouldShowComplication*/
+ false, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
assertThat(lifecycleRegistry.mLifecycles)
.containsExactly(
Lifecycle.State.CREATED,
Lifecycle.State.STARTED,
- Lifecycle.State.RESUMED
+ Lifecycle.State.RESUMED,
)
}
@@ -925,7 +925,7 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
false /*isPreview*/,
- false /*shouldShowComplication*/
+ false, /*shouldShowComplication*/
)
testScope.runCurrent()
mMainExecutor.runAllReady()
@@ -942,7 +942,7 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
false /*isPreview*/,
- false /*shouldShowComplication*/
+ false, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
mService.onDestroy()
@@ -952,7 +952,7 @@
Lifecycle.State.CREATED,
Lifecycle.State.STARTED,
Lifecycle.State.RESUMED,
- Lifecycle.State.DESTROYED
+ Lifecycle.State.DESTROYED,
)
}
@@ -966,7 +966,7 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
false /*isPreview*/,
- false /*shouldShowComplication*/
+ false, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
assertThat(lifecycleRegistry.currentState).isEqualTo(Lifecycle.State.RESUMED)
@@ -998,7 +998,7 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
false /*isPreview*/,
- false /*shouldShowComplication*/
+ false, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
assertThat(lifecycleRegistry.currentState).isEqualTo(Lifecycle.State.RESUMED)
@@ -1030,7 +1030,7 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
false /*isPreview*/,
- false /*shouldShowComplication*/
+ false, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
assertThat(lifecycleRegistry.currentState).isEqualTo(Lifecycle.State.RESUMED)
@@ -1066,7 +1066,7 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
false /*isPreview*/,
- false /*shouldShowComplication*/
+ false, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
assertThat(lifecycleRegistry.currentState).isEqualTo(Lifecycle.State.RESUMED)
@@ -1101,7 +1101,7 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
false /*isPreview*/,
- false /*shouldShowComplication*/
+ false, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
@@ -1130,7 +1130,7 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
true /*isPreview*/,
- false /*shouldShowComplication*/
+ false, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
@@ -1148,7 +1148,7 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
false /*isPreview*/,
- false /*shouldShowComplication*/
+ false, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
@@ -1181,7 +1181,7 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
false /*isPreview*/,
- false /*shouldShowComplication*/
+ false, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
@@ -1214,7 +1214,7 @@
mDreamComplicationComponentFactory,
mDreamOverlayComponentFactory,
mComplicationComponentFactory,
- mAmbientTouchComponentFactory
+ mAmbientTouchComponentFactory,
)
mService.onEndDream()
@@ -1223,7 +1223,7 @@
mDreamComplicationComponentFactory,
mDreamOverlayComponentFactory,
mComplicationComponentFactory,
- mAmbientTouchComponentFactory
+ mAmbientTouchComponentFactory,
)
client.startDream(
@@ -1231,7 +1231,7 @@
mDreamOverlayCallback,
DREAM_COMPONENT,
false /*isPreview*/,
- false /*shouldShowComplication*/
+ false, /*shouldShowComplication*/
)
mMainExecutor.runAllReady()
environmentComponents.verifyNoMoreInteractions()
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadStatsInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadStatsInteractorTest.kt
similarity index 100%
rename from packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadStatsInteractorTest.kt
rename to packages/SystemUI/tests/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadStatsInteractorTest.kt
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/lifecycle/HydratorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/lifecycle/HydratorTest.kt
similarity index 95%
rename from packages/SystemUI/multivalentTests/src/com/android/systemui/lifecycle/HydratorTest.kt
rename to packages/SystemUI/tests/src/com/android/systemui/lifecycle/HydratorTest.kt
index ec6045c..b0e93fb 100644
--- a/packages/SystemUI/multivalentTests/src/com/android/systemui/lifecycle/HydratorTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/lifecycle/HydratorTest.kt
@@ -59,11 +59,11 @@
Column {
Text(
"upstreamStateFlow=${viewModel.stateBackedByStateFlow}",
- Modifier.testTag("upstreamStateFlow")
+ Modifier.testTag("upstreamStateFlow"),
)
Text(
"upstreamFlow=${viewModel.stateBackedByFlow}",
- Modifier.testTag("upstreamFlow")
+ Modifier.testTag("upstreamFlow"),
)
}
}
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsUserActionsViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsUserActionsViewModelTest.kt
similarity index 100%
rename from packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsUserActionsViewModelTest.kt
rename to packages/SystemUI/tests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsUserActionsViewModelTest.kt
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/domain/interactor/HeadsUpNotificationInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/domain/interactor/HeadsUpNotificationInteractorTest.kt
similarity index 100%
rename from packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/domain/interactor/HeadsUpNotificationInteractorTest.kt
rename to packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/domain/interactor/HeadsUpNotificationInteractorTest.kt