diff options
2 files changed, 10 insertions, 3 deletions
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt index d83f3aae1ace..249b3e14ec72 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt @@ -74,7 +74,7 @@ fun CommunalContainer( ) { val currentScene: SceneKey by viewModel.currentScene - .transform<CommunalSceneKey, SceneKey> { value -> value.toTransitionSceneKey() } + .transform { value -> emit(value.toTransitionSceneKey()) } .collectAsState(TransitionSceneKey.Blank) val sceneTransitionLayoutState = remember { SceneTransitionLayoutState(currentScene) } // Don't show hub mode UI if keyguard is present. This is important since we're in the shade, diff --git a/packages/SystemUI/src/com/android/systemui/communal/widgets/EditWidgetsActivity.kt b/packages/SystemUI/src/com/android/systemui/communal/widgets/EditWidgetsActivity.kt index 573a748b4290..887b18cfe4c9 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/widgets/EditWidgetsActivity.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/widgets/EditWidgetsActivity.kt @@ -19,7 +19,9 @@ package com.android.systemui.communal.widgets import android.appwidget.AppWidgetProviderInfo import android.content.Intent import android.os.Bundle +import android.os.RemoteException import android.util.Log +import android.view.IWindowManager import androidx.activity.ComponentActivity import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult @@ -34,6 +36,7 @@ class EditWidgetsActivity constructor( private val communalViewModel: CommunalEditModeViewModel, private val communalInteractor: CommunalInteractor, + private var windowManagerService: IWindowManager? = null, ) : ComponentActivity() { companion object { /** @@ -77,8 +80,12 @@ constructor( ) }, onEditDone = { - // TODO(b/315154364): in a separate change, lock the device and transition to GH - finish() + try { + checkNotNull(windowManagerService).lockNow(/* options */ null) + finish() + } catch (e: RemoteException) { + Log.e(TAG, "Couldn't lock the device as WindowManager is dead.") + } } ) } |