Merge "Fix a bug with showing the widget picker on edit activity launch." into main (7c3ca93d) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/communal/widgets/EditWidgetsActivity.kt

+7 −5

Original line number	Diff line number	Diff line
		@@ -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)
		}