Merge "SystemUIBottomSheetDialog call dismiss() when hide it" into main (71a4fd54) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/display/ui/viewmodel/ConnectingDisplayViewModel.kt

+6 −6

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@ constructor(
		.combine(concurrentDisplaysInProgessFlow) { pendingDisplay, concurrentDisplaysInProgress
		->
		if (pendingDisplay == null) {
		hideDialog()
		dismissDialog()
		} else {
		showDialog(pendingDisplay, concurrentDisplaysInProgress)
		}
		@@ -88,17 +88,17 @@ constructor(
		}

		private fun showDialog(pendingDisplay: PendingDisplay, concurrentDisplaysInProgess: Boolean) {
		hideDialog()
		dismissDialog()
		dialog =
		bottomSheetFactory
		.createDialog(
		onStartMirroringClickListener = {
		scope.launch(bgDispatcher) { pendingDisplay.enable() }
		hideDialog()
		dismissDialog()
		},
		onCancelMirroring = {
		scope.launch(bgDispatcher) { pendingDisplay.ignore() }
		hideDialog()
		dismissDialog()
		},
		navbarBottomInsetsProvider = { Utils.getNavbarInsets(context).bottom },
		showConcurrentDisplayInfo = concurrentDisplaysInProgess
		@@ -106,8 +106,8 @@ constructor(
		.apply { show() }
		}

		private fun hideDialog() {
		dialog?.hide()
		private fun dismissDialog() {
		dialog?.dismiss()
		dialog = null
		}