From 1f00a70a55f8d64b77d887cbaabfeb5e2892dfd5 Mon Sep 17 00:00:00 2001 From: Will Leshner Date: Mon, 5 Aug 2024 14:54:08 -0700 Subject: Fix a bug with showing the widget picker on edit activity launch. Delaying showing the widget picker until after the edit activity has appeared avoids an issue with transitions that results in the edit activity being closed prematurely. Bug: 357150334 Test: manually Flag: EXEMPT bugfix Change-Id: I2c7dbeb8fb330f29c72c0e6d31fa5611e6c927c2 --- .../android/systemui/communal/widgets/EditWidgetsActivity.kt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) 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 03ef17b6ec5b..948f4cda7c59 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/widgets/EditWidgetsActivity.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/widgets/EditWidgetsActivity.kt @@ -154,6 +154,13 @@ constructor( // edit mode communalViewModel.currentScene.first { it == CommunalScenes.Blank } communalViewModel.setEditModeState(EditModeState.SHOWING) + + // Show the widget picker, if necessary, after the edit activity has animated in. + // Waiting until after the activity has appeared avoids transitions issues. + if (shouldOpenWidgetPickerOnStart) { + onOpenWidgetPicker() + shouldOpenWidgetPickerOnStart = false + } } } } @@ -198,11 +205,6 @@ constructor( communalViewModel.setEditActivityShowing(true) - if (shouldOpenWidgetPickerOnStart) { - onOpenWidgetPicker() - shouldOpenWidgetPickerOnStart = false - } - logger.i("Starting the communal widget editor activity") uiEventLogger.log(CommunalUiEvent.COMMUNAL_HUB_EDIT_MODE_SHOWN) } -- cgit v1.2.3-59-g8ed1b