Merge "Don't show dialog when device is in kiosk mode & extended mode" into main (897f8802) · Commits · e / os / android_frameworks_base

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

+22 −12

Original line number	Diff line number	Diff line
		@@ -188,18 +188,28 @@ constructor(

		val isInExtendedMode = desktopState.isDesktopModeSupportedOnDisplay(DEFAULT_DISPLAY)

		if (isInKioskMode) {
		when {
		isInKioskMode && isInExtendedMode -> {
		pendingDisplay.enableForMirroring()
		}
		isInKioskMode -> {
		dismissDialog()
		pendingDisplay.showNewDialog(concurrentDisplaysInProgress, isInKioskMode)
		} else if (isInExtendedMode) {
		pendingDisplay.showNewDialog(concurrentDisplaysInProgress, isInKioskMode = true)
		}
		isInExtendedMode -> {
		pendingDisplay.enableForDesktop()
		showExtendedDisplayConnectionToast()
		} else {
		}
		else -> {
		when (pendingDisplay.connectionType) {
		DESKTOP -> pendingDisplay.enableForDesktop()
		MIRROR -> pendingDisplay.enableForMirroring()
		NOT_SPECIFIED ->
		pendingDisplay.showNewDialog(concurrentDisplaysInProgress, isInKioskMode)
		pendingDisplay.showNewDialog(
		concurrentDisplaysInProgress,
		isInKioskMode = false,
		)
		}
		}
		}
		}