Merge "Unpause work profile from GH" into main
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt
index 54237bb..0d6b710 100644
--- a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt
@@ -119,7 +119,7 @@
import com.android.systemui.communal.ui.compose.extensions.allowGestures
import com.android.systemui.communal.ui.compose.extensions.detectLongPressGesture
import com.android.systemui.communal.ui.compose.extensions.firstItemAtOffset
-import com.android.systemui.communal.ui.compose.extensions.observeTapsWithoutConsuming
+import com.android.systemui.communal.ui.compose.extensions.observeTaps
import com.android.systemui.communal.ui.viewmodel.BaseCommunalViewModel
import com.android.systemui.communal.ui.viewmodel.CommunalEditModeViewModel
import com.android.systemui.communal.ui.viewmodel.CommunalViewModel
@@ -168,7 +168,7 @@
.pointerInput(gridState, contentOffset, contentListState) {
// If not in edit mode, don't allow selecting items.
if (!viewModel.isEditMode) return@pointerInput
- observeTapsWithoutConsuming { offset ->
+ observeTaps { offset ->
val adjustedOffset = offset - contentOffset
val index = firstIndexAtOffset(gridState, adjustedOffset)
val key = index?.let { keyAtIndexIfEditable(contentListState.list, index) }
@@ -277,13 +277,26 @@
if (viewModel is CommunalViewModel && dialogFactory != null) {
val isEnableWidgetDialogShowing by
viewModel.isEnableWidgetDialogShowing.collectAsState(false)
+ val isEnableWorkProfileDialogShowing by
+ viewModel.isEnableWorkProfileDialogShowing.collectAsState(false)
EnableWidgetDialog(
isEnableWidgetDialogVisible = isEnableWidgetDialogShowing,
dialogFactory = dialogFactory,
+ title = stringResource(id = R.string.dialog_title_to_allow_any_widget),
+ positiveButtonText = stringResource(id = R.string.button_text_to_open_settings),
onConfirm = viewModel::onEnableWidgetDialogConfirm,
onCancel = viewModel::onEnableWidgetDialogCancel
)
+
+ EnableWidgetDialog(
+ isEnableWidgetDialogVisible = isEnableWorkProfileDialogShowing,
+ dialogFactory = dialogFactory,
+ title = stringResource(id = R.string.work_mode_off_title),
+ positiveButtonText = stringResource(id = R.string.work_mode_turn_on),
+ onConfirm = viewModel::onEnableWorkProfileDialogConfirm,
+ onCancel = viewModel::onEnableWorkProfileDialogCancel
+ )
}
// This spacer covers the edge of the LazyHorizontalGrid and prevents it from receiving
@@ -769,7 +782,16 @@
modifier: Modifier = Modifier,
) {
Box(
- modifier = modifier,
+ modifier =
+ modifier.thenIf(!viewModel.isEditMode && model.inQuietMode) {
+ Modifier.pointerInput(Unit) {
+ // consume tap to prevent the child view from triggering interactions with the
+ // app widget
+ observeTaps(shouldConsume = true) { _ ->
+ viewModel.onOpenEnableWorkProfileDialog()
+ }
+ }
+ }
) {
AndroidView(
modifier = Modifier.fillMaxSize().allowGestures(allowed = !viewModel.isEditMode),
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/EnableWidgetDialog.kt b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/EnableWidgetDialog.kt
index 976a01d..df11206 100644
--- a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/EnableWidgetDialog.kt
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/EnableWidgetDialog.kt
@@ -16,52 +16,64 @@
package com.android.systemui.communal.ui.compose
-import android.app.Dialog
-import android.content.DialogInterface
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import com.android.compose.theme.LocalAndroidColorScheme
import com.android.systemui.res.R
+import com.android.systemui.statusbar.phone.ComponentSystemUIDialog
import com.android.systemui.statusbar.phone.SystemUIDialogFactory
+import com.android.systemui.statusbar.phone.create
-/**
- * Dialog shown upon tapping a disabled widget. It enables users to navigate to settings and modify
- * allowed widget categories.
- */
+/** Dialog shown upon tapping a disabled widget which allows users to enable the widget. */
@Composable
fun EnableWidgetDialog(
isEnableWidgetDialogVisible: Boolean,
dialogFactory: SystemUIDialogFactory,
+ title: String,
+ positiveButtonText: String,
onConfirm: () -> Unit,
onCancel: () -> Unit
) {
- var dialog: Dialog? by remember { mutableStateOf(null) }
+ var dialog: ComponentSystemUIDialog? by remember { mutableStateOf(null) }
val context = LocalView.current.context
DisposableEffect(isEnableWidgetDialogVisible) {
if (isEnableWidgetDialogVisible) {
dialog =
- dialogFactory.create(context = context).apply {
- setTitle(context.getString(R.string.dialog_title_to_allow_any_widget))
- setButton(
- DialogInterface.BUTTON_NEGATIVE,
- context.getString(R.string.cancel)
- ) { _, _ ->
- onCancel()
- }
- setButton(
- DialogInterface.BUTTON_POSITIVE,
- context.getString(R.string.button_text_to_open_settings)
- ) { _, _ ->
- onConfirm()
- }
- setCancelable(false)
- show()
+ dialogFactory.create(
+ context = context,
+ ) {
+ DialogComposable(title, positiveButtonText, onConfirm, onCancel)
}
+ dialog?.apply {
+ setCancelable(true)
+ setCanceledOnTouchOutside(true)
+ setOnCancelListener { onCancel() }
+ show()
+ }
}
onDispose {
@@ -70,3 +82,62 @@
}
}
}
+
+@Composable
+private fun DialogComposable(
+ title: String,
+ positiveButtonText: String,
+ onConfirm: () -> Unit,
+ onCancel: () -> Unit,
+) {
+ Box(
+ Modifier.fillMaxWidth()
+ .padding(top = 18.dp, bottom = 8.dp)
+ .background(LocalAndroidColorScheme.current.surfaceBright, RoundedCornerShape(28.dp))
+ ) {
+ Column(
+ modifier = Modifier.fillMaxWidth(),
+ verticalArrangement = Arrangement.spacedBy(20.dp),
+ ) {
+ Box(
+ modifier = Modifier.padding(horizontal = 24.dp).fillMaxWidth().wrapContentHeight(),
+ contentAlignment = Alignment.TopStart
+ ) {
+ Text(
+ text = title,
+ style = MaterialTheme.typography.titleMedium,
+ color = LocalAndroidColorScheme.current.onSurface,
+ textAlign = TextAlign.Center,
+ maxLines = 1,
+ )
+ }
+
+ Box(
+ modifier = Modifier.padding(end = 12.dp).fillMaxWidth().wrapContentHeight(),
+ contentAlignment = Alignment.Center
+ ) {
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ horizontalArrangement = Arrangement.End,
+ ) {
+ TextButton(
+ contentPadding = PaddingValues(16.dp),
+ onClick = onCancel,
+ ) {
+ Text(
+ text = stringResource(R.string.cancel),
+ )
+ }
+ TextButton(
+ contentPadding = PaddingValues(16.dp),
+ onClick = onConfirm,
+ ) {
+ Text(
+ text = positiveButtonText,
+ )
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/extensions/PointerInputScopeExt.kt b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/extensions/PointerInputScopeExt.kt
index bc1e429..379c165 100644
--- a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/extensions/PointerInputScopeExt.kt
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/extensions/PointerInputScopeExt.kt
@@ -30,16 +30,18 @@
import kotlinx.coroutines.coroutineScope
/**
- * Observe taps without actually consuming them, so child elements can still respond to them. Long
+ * Observe taps without consuming them by default, so child elements can still respond to them. Long
* presses are excluded.
*/
-suspend fun PointerInputScope.observeTapsWithoutConsuming(
+suspend fun PointerInputScope.observeTaps(
pass: PointerEventPass = PointerEventPass.Initial,
+ shouldConsume: Boolean = false,
onTap: ((Offset) -> Unit)? = null,
) = coroutineScope {
if (onTap == null) return@coroutineScope
awaitEachGesture {
- awaitFirstDown(pass = pass)
+ val down = awaitFirstDown(pass = pass)
+ if (shouldConsume) down.consume()
val tapTimeout = viewConfiguration.longPressTimeoutMillis
val up = withTimeoutOrNull(tapTimeout) { waitForUpOrCancellation(pass = pass) }
if (up != null) {
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/domain/interactor/CommunalInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/domain/interactor/CommunalInteractorTest.kt
index 1a4f61e..a5707e1 100644
--- a/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/domain/interactor/CommunalInteractorTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/domain/interactor/CommunalInteractorTest.kt
@@ -22,6 +22,8 @@
import android.content.Intent
import android.content.pm.UserInfo
import android.os.UserHandle
+import android.os.UserManager
+import android.os.userManager
import android.provider.Settings
import android.provider.Settings.Secure.HUB_MODE_TUTORIAL_COMPLETED
import android.widget.RemoteViews
@@ -65,6 +67,7 @@
import com.android.systemui.testKosmos
import com.android.systemui.user.data.repository.FakeUserRepository
import com.android.systemui.user.data.repository.fakeUserRepository
+import com.android.systemui.util.mockito.any
import com.android.systemui.util.mockito.argumentCaptor
import com.android.systemui.util.mockito.capture
import com.android.systemui.util.mockito.mock
@@ -79,6 +82,7 @@
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers.anyInt
import org.mockito.ArgumentMatchers.eq
import org.mockito.Mock
import org.mockito.Mockito.mock
@@ -111,6 +115,7 @@
private lateinit var sceneInteractor: SceneInteractor
private lateinit var userTracker: FakeUserTracker
private lateinit var activityStarter: ActivityStarter
+ private lateinit var userManager: UserManager
private lateinit var underTest: CommunalInteractor
@@ -130,9 +135,12 @@
sceneInteractor = kosmos.sceneInteractor
userTracker = kosmos.fakeUserTracker
activityStarter = kosmos.activityStarter
+ userManager = kosmos.userManager
whenever(mainUser.isMain).thenReturn(true)
whenever(secondaryUser.isMain).thenReturn(false)
+ whenever(userManager.isQuietModeEnabled(any<UserHandle>())).thenReturn(false)
+ whenever(userManager.isManagedProfile(anyInt())).thenReturn(false)
userRepository.setUserInfos(listOf(mainUser, secondaryUser))
kosmos.fakeFeatureFlagsClassic.set(Flags.COMMUNAL_SERVICE_ENABLED, true)
@@ -851,6 +859,63 @@
}
@Test
+ fun widgetContent_inQuietMode() =
+ testScope.runTest {
+ // Keyguard showing, and tutorial completed.
+ keyguardRepository.setKeyguardShowing(true)
+ keyguardRepository.setKeyguardOccluded(false)
+ tutorialRepository.setTutorialSettingState(HUB_MODE_TUTORIAL_COMPLETED)
+
+ // Work profile is set up.
+ val userInfos = listOf(MAIN_USER_INFO, USER_INFO_WORK)
+ userRepository.setUserInfos(userInfos)
+ userTracker.set(
+ userInfos = userInfos,
+ selectedUserIndex = 0,
+ )
+ runCurrent()
+
+ // Keyguard widgets are allowed.
+ kosmos.fakeSettings.putIntForUser(
+ CommunalSettingsRepositoryImpl.GLANCEABLE_HUB_CONTENT_SETTING,
+ AppWidgetProviderInfo.WIDGET_CATEGORY_KEYGUARD,
+ mainUser.id
+ )
+ runCurrent()
+
+ // When work profile is paused.
+ whenever(userManager.isQuietModeEnabled(eq(UserHandle.of(USER_INFO_WORK.id))))
+ .thenReturn(true)
+ whenever(userManager.isManagedProfile(eq(USER_INFO_WORK.id))).thenReturn(true)
+
+ val widgetContent by collectLastValue(underTest.widgetContent)
+ val widget1 = createWidgetForUser(1, USER_INFO_WORK.id)
+ val widget2 = createWidgetForUser(2, MAIN_USER_INFO.id)
+ val widget3 = createWidgetForUser(3, MAIN_USER_INFO.id)
+ val widgets = listOf(widget1, widget2, widget3)
+ widgetRepository.setCommunalWidgets(widgets)
+
+ // The work profile widget is in quiet mode, while other widgets are not.
+ assertThat(widgetContent).hasSize(3)
+ widgetContent!!.forEach { model ->
+ assertThat(model)
+ .isInstanceOf(CommunalContentModel.WidgetContent.Widget::class.java)
+ }
+ assertThat(
+ (widgetContent!![0] as CommunalContentModel.WidgetContent.Widget).inQuietMode
+ )
+ .isTrue()
+ assertThat(
+ (widgetContent!![1] as CommunalContentModel.WidgetContent.Widget).inQuietMode
+ )
+ .isFalse()
+ assertThat(
+ (widgetContent!![2] as CommunalContentModel.WidgetContent.Widget).inQuietMode
+ )
+ .isFalse()
+ }
+
+ @Test
fun widgetContent_containsDisabledWidgets_whenCategoryNotAllowed() =
testScope.runTest {
// Communal available, and tutorial completed.
@@ -951,7 +1016,10 @@
private fun createWidgetForUser(appWidgetId: Int, userId: Int): CommunalWidgetContentModel =
mock<CommunalWidgetContentModel> {
whenever(this.appWidgetId).thenReturn(appWidgetId)
- val providerInfo = mock<AppWidgetProviderInfo>()
+ val providerInfo =
+ mock<AppWidgetProviderInfo>().apply {
+ widgetCategory = AppWidgetProviderInfo.WIDGET_CATEGORY_KEYGUARD
+ }
whenever(providerInfo.profile).thenReturn(UserHandle(userId))
whenever(this.providerInfo).thenReturn(providerInfo)
}
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index d8e68f2..25596cc 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -1139,6 +1139,10 @@
<string name="dialog_title_to_allow_any_widget">Allow any widget on lock screen?</string>
<!-- Text for the button in the dialog that opens when tapping on disabled widgets. [CHAR LIMIT=NONE] -->
<string name="button_text_to_open_settings">Open settings</string>
+ <!-- Title of a dialog. This text is confirming that the user wants to turn on access to their work apps, which the user had previously paused. "Work" is an adjective. [CHAR LIMIT=30] -->
+ <string name="work_mode_off_title">Unpause work apps?</string>
+ <!-- Title for button to unpause on work profile. [CHAR LIMIT=NONE] -->
+ <string name="work_mode_turn_on">Unpause</string>
<!-- Related to user switcher --><skip/>
diff --git a/packages/SystemUI/src/com/android/systemui/communal/domain/interactor/CommunalInteractor.kt b/packages/SystemUI/src/com/android/systemui/communal/domain/interactor/CommunalInteractor.kt
index fa10d85..940b48c 100644
--- a/packages/SystemUI/src/com/android/systemui/communal/domain/interactor/CommunalInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/communal/domain/interactor/CommunalInteractor.kt
@@ -19,10 +19,13 @@
import android.app.smartspace.SmartspaceTarget
import android.content.ComponentName
import android.content.Intent
+import android.content.IntentFilter
import android.os.UserHandle
+import android.os.UserManager
import android.provider.Settings
import com.android.compose.animation.scene.ObservableTransitionState
import com.android.compose.animation.scene.SceneKey
+import com.android.systemui.broadcast.BroadcastDispatcher
import com.android.systemui.communal.data.repository.CommunalMediaRepository
import com.android.systemui.communal.data.repository.CommunalPrefsRepository
import com.android.systemui.communal.data.repository.CommunalRepository
@@ -56,6 +59,7 @@
import com.android.systemui.util.kotlin.BooleanFlowOperators.and
import com.android.systemui.util.kotlin.BooleanFlowOperators.not
import com.android.systemui.util.kotlin.BooleanFlowOperators.or
+import com.android.systemui.util.kotlin.emitOnStart
import javax.inject.Inject
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -81,6 +85,7 @@
@Inject
constructor(
@Application applicationScope: CoroutineScope,
+ broadcastDispatcher: BroadcastDispatcher,
private val communalRepository: CommunalRepository,
private val widgetRepository: CommunalWidgetRepository,
private val communalPrefsRepository: CommunalPrefsRepository,
@@ -92,6 +97,7 @@
private val editWidgetsActivityStarter: EditWidgetsActivityStarter,
private val userTracker: UserTracker,
private val activityStarter: ActivityStarter,
+ private val userManager: UserManager,
sceneInteractor: SceneInteractor,
sceneContainerFlags: SceneContainerFlags,
@CommunalLog logBuffer: LogBuffer,
@@ -288,6 +294,33 @@
fun updateWidgetOrder(widgetIdToPriorityMap: Map<Int, Int>) =
widgetRepository.updateWidgetOrder(widgetIdToPriorityMap)
+ /** Request to unpause work profile that is currently in quiet mode. */
+ fun unpauseWorkProfile() {
+ userTracker.userProfiles
+ .find { it.isManagedProfile }
+ ?.userHandle
+ ?.let { userHandle ->
+ userManager.requestQuietModeEnabled(/* enableQuietMode */ false, userHandle)
+ }
+ }
+
+ /** Returns true if work profile is in quiet mode (disabled) for user handle. */
+ private fun isQuietModeEnabled(userHandle: UserHandle): Boolean =
+ userManager.isManagedProfile(userHandle.identifier) &&
+ userManager.isQuietModeEnabled(userHandle)
+
+ /** Emits whenever a work profile pause or unpause broadcast is received. */
+ private val updateOnWorkProfileBroadcastReceived: Flow<Unit> =
+ broadcastDispatcher
+ .broadcastFlow(
+ filter =
+ IntentFilter().apply {
+ addAction(Intent.ACTION_MANAGED_PROFILE_AVAILABLE)
+ addAction(Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE)
+ },
+ )
+ .emitOnStart()
+
/** All widgets present in db. */
val communalWidgets: Flow<List<CommunalWidgetContentModel>> =
isCommunalAvailable.flatMapLatest { available ->
@@ -298,8 +331,9 @@
val widgetContent: Flow<List<WidgetContent>> =
combine(
widgetRepository.communalWidgets.map { filterWidgetsByExistingUsers(it) },
- communalSettingsInteractor.communalWidgetCategories
- ) { widgets, allowedCategories ->
+ communalSettingsInteractor.communalWidgetCategories,
+ updateOnWorkProfileBroadcastReceived,
+ ) { widgets, allowedCategories, _ ->
widgets.map { widget ->
if (widget.providerInfo.widgetCategory and allowedCategories != 0) {
// At least one category this widget specified is allowed, so show it
@@ -307,6 +341,7 @@
appWidgetId = widget.appWidgetId,
providerInfo = widget.providerInfo,
appWidgetHost = appWidgetHost,
+ inQuietMode = isQuietModeEnabled(widget.providerInfo.profile)
)
} else {
WidgetContent.DisabledWidget(
diff --git a/packages/SystemUI/src/com/android/systemui/communal/domain/model/CommunalContentModel.kt b/packages/SystemUI/src/com/android/systemui/communal/domain/model/CommunalContentModel.kt
index 12576d4..5fabd3c 100644
--- a/packages/SystemUI/src/com/android/systemui/communal/domain/model/CommunalContentModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/communal/domain/model/CommunalContentModel.kt
@@ -51,6 +51,7 @@
override val appWidgetId: Int,
override val providerInfo: AppWidgetProviderInfo,
val appWidgetHost: CommunalAppWidgetHost,
+ val inQuietMode: Boolean,
) : WidgetContent {
override val key = KEY.widget(appWidgetId)
// Widget size is always half.
diff --git a/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/BaseCommunalViewModel.kt b/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/BaseCommunalViewModel.kt
index feb506a..85f3c20 100644
--- a/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/BaseCommunalViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/BaseCommunalViewModel.kt
@@ -72,6 +72,8 @@
open fun onOpenEnableWidgetDialog() {}
+ open fun onOpenEnableWorkProfileDialog() {}
+
/** A list of all the communal content to be displayed in the communal hub. */
abstract val communalContent: Flow<List<CommunalContentModel>>
diff --git a/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalViewModel.kt b/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalViewModel.kt
index 0c332f5..6e69ed7 100644
--- a/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalViewModel.kt
@@ -90,6 +90,11 @@
private val _isEnableWidgetDialogShowing: MutableStateFlow<Boolean> = MutableStateFlow(false)
val isEnableWidgetDialogShowing: Flow<Boolean> = _isEnableWidgetDialogShowing.asStateFlow()
+ private val _isEnableWorkProfileDialogShowing: MutableStateFlow<Boolean> =
+ MutableStateFlow(false)
+ val isEnableWorkProfileDialogShowing: Flow<Boolean> =
+ _isEnableWorkProfileDialogShowing.asStateFlow()
+
/** Whether touches should be disabled in communal */
val touchesAllowed: Flow<Boolean> = not(shadeInteractor.isAnyFullyExpanded)
@@ -136,10 +141,27 @@
setIsEnableWidgetDialogShowing(false)
}
+ override fun onOpenEnableWorkProfileDialog() {
+ setIsEnableWorkProfileDialogShowing(true)
+ }
+
+ fun onEnableWorkProfileDialogConfirm() {
+ communalInteractor.unpauseWorkProfile()
+ setIsEnableWorkProfileDialogShowing(false)
+ }
+
+ fun onEnableWorkProfileDialogCancel() {
+ setIsEnableWorkProfileDialogShowing(false)
+ }
+
private fun setIsEnableWidgetDialogShowing(isVisible: Boolean) {
_isEnableWidgetDialogShowing.value = isVisible
}
+ private fun setIsEnableWorkProfileDialogShowing(isVisible: Boolean) {
+ _isEnableWorkProfileDialogShowing.value = isVisible
+ }
+
private fun setPopupOnDismissCtaVisibility(isVisible: Boolean) {
_isPopupOnDismissCtaShowing.value = isVisible
}
diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/communal/domain/interactor/CommunalInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/communal/domain/interactor/CommunalInteractorKosmos.kt
index 161c6fb..8866fd3 100644
--- a/packages/SystemUI/tests/utils/src/com/android/systemui/communal/domain/interactor/CommunalInteractorKosmos.kt
+++ b/packages/SystemUI/tests/utils/src/com/android/systemui/communal/domain/interactor/CommunalInteractorKosmos.kt
@@ -16,6 +16,8 @@
package com.android.systemui.communal.domain.interactor
+import android.os.userManager
+import com.android.systemui.broadcast.broadcastDispatcher
import com.android.systemui.communal.data.repository.communalMediaRepository
import com.android.systemui.communal.data.repository.communalPrefsRepository
import com.android.systemui.communal.data.repository.communalRepository
@@ -40,6 +42,7 @@
val Kosmos.communalInteractor by Fixture {
CommunalInteractor(
applicationScope = applicationCoroutineScope,
+ broadcastDispatcher = broadcastDispatcher,
communalRepository = communalRepository,
widgetRepository = communalWidgetRepository,
mediaRepository = communalMediaRepository,
@@ -50,6 +53,7 @@
editWidgetsActivityStarter = editWidgetsActivityStarter,
userTracker = userTracker,
activityStarter = activityStarter,
+ userManager = userManager,
logBuffer = logcatLogBuffer("CommunalInteractor"),
tableLogBuffer = mock(),
communalSettingsInteractor = communalSettingsInteractor,