Merge "Fix flakiness of MirroringConfirmationDialogScerenshotTest" into main (6d222434) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/display/ui/view/MirroringConfirmationDialog.kt

+3 −3

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

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@ package com.android.systemui.display.ui.viewmodel

	import android.app.Dialog		import android.app.Dialog
	import android.content.Context		import android.content.Context
			import com.android.systemui.biometrics.Utils
	import com.android.systemui.dagger.SysUISingleton		import com.android.systemui.dagger.SysUISingleton
	import com.android.systemui.dagger.qualifiers.Application		import com.android.systemui.dagger.qualifiers.Application
	import com.android.systemui.dagger.qualifiers.Background		import com.android.systemui.dagger.qualifiers.Background
	@@ -74,7 +75,8 @@ constructor(
	scope.launch(bgDispatcher) { pendingDisplay.ignore() }		scope.launch(bgDispatcher) { pendingDisplay.ignore() }
	hideDialog()		hideDialog()
	},		},
	configurationController		navbarBottomInsetsProvider = { Utils.getNavbarInsets(context).bottom },
			configurationController,
	)		)
	.apply { show() }		.apply { show() }
	}		}

packages/SystemUI/tests/src/com/android/systemui/display/ui/view/MirroringConfirmationDialogTest.kt

+8 −2

Original line number	Original line	Diff line number	Diff line
	@@ -20,8 +20,8 @@ import android.testing.AndroidTestingRunner
	import android.testing.TestableLooper		import android.testing.TestableLooper
	import android.view.View		import android.view.View
	import androidx.test.filters.SmallTest		import androidx.test.filters.SmallTest
	import com.android.systemui.res.R
	import com.android.systemui.SysuiTestCase		import com.android.systemui.SysuiTestCase
			import com.android.systemui.res.R
	import com.android.systemui.util.mockito.any		import com.android.systemui.util.mockito.any
	import com.android.systemui.util.mockito.mock		import com.android.systemui.util.mockito.mock
	import org.junit.After		import org.junit.After
	@@ -45,7 +45,13 @@ class MirroringConfirmationDialogTest : SysuiTestCase() {
	fun setUp() {		fun setUp() {
	MockitoAnnotations.initMocks(this)		MockitoAnnotations.initMocks(this)

	dialog = MirroringConfirmationDialog(context, onStartMirroringCallback, onCancelCallback)		dialog =
			MirroringConfirmationDialog(
			context,
			onStartMirroringCallback,
			onCancelCallback,
			navbarBottomInsetsProvider = { 0 },
			)
	}		}

	@Test		@Test

Original line number	Original line	Diff line number	Diff line
	@@ -20,7 +20,6 @@ import android.os.Bundle
	import android.view.View		import android.view.View
	import android.widget.TextView		import android.widget.TextView
	import androidx.core.view.updatePadding		import androidx.core.view.updatePadding
	import com.android.systemui.biometrics.Utils
	import com.android.systemui.res.R		import com.android.systemui.res.R
	import com.android.systemui.statusbar.phone.SystemUIBottomSheetDialog		import com.android.systemui.statusbar.phone.SystemUIBottomSheetDialog
	import com.android.systemui.statusbar.policy.ConfigurationController		import com.android.systemui.statusbar.policy.ConfigurationController
	@@ -36,6 +35,7 @@ class MirroringConfirmationDialog(
	context: Context,		context: Context,
	private val onStartMirroringClickListener: View.OnClickListener,		private val onStartMirroringClickListener: View.OnClickListener,
	private val onCancelMirroring: View.OnClickListener,		private val onCancelMirroring: View.OnClickListener,
			private val navbarBottomInsetsProvider: () -> Int,
	configurationController: ConfigurationController? = null,		configurationController: ConfigurationController? = null,
	theme: Int = R.style.Theme_SystemUI_Dialog,		theme: Int = R.style.Theme_SystemUI_Dialog,
	) : SystemUIBottomSheetDialog(context, configurationController, theme) {		) : SystemUIBottomSheetDialog(context, configurationController, theme) {
	@@ -67,12 +67,12 @@ class MirroringConfirmationDialog(
	private fun setupInsets() {		private fun setupInsets() {
	// This avoids overlap between dialog content and navigation bars.		// This avoids overlap between dialog content and navigation bars.
	requireViewById<View>(R.id.cd_bottom_sheet).apply {		requireViewById<View>(R.id.cd_bottom_sheet).apply {
	val navbarInsets = Utils.getNavbarInsets(context)		val navbarInsets = navbarBottomInsetsProvider()
	val defaultDialogBottomInset =		val defaultDialogBottomInset =
	context.resources.getDimensionPixelSize(R.dimen.dialog_bottom_padding)		context.resources.getDimensionPixelSize(R.dimen.dialog_bottom_padding)
	// we only care about the bottom inset as in all other configuration where navigations		// we only care about the bottom inset as in all other configuration where navigations
	// are in other display sides there is no overlap with the dialog.		// are in other display sides there is no overlap with the dialog.
	updatePadding(bottom = max(navbarInsets.bottom, defaultDialogBottomInset))		updatePadding(bottom = max(navbarInsets, defaultDialogBottomInset))
	}		}
	}		}