Merge "Hide QS shade when triggering ExtraDim migration dialog" into main (00b4fbaf) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/extradim/ExtraDimDialogManagerTest.kt

+14 −2

Original line number	Original line	Diff line number	Diff line
	@@ -15,6 +15,7 @@
	*/		*/
	package com.android.systemui.accessibility.extradim		package com.android.systemui.accessibility.extradim

			import android.os.Handler
	import androidx.test.ext.junit.runners.AndroidJUnit4		import androidx.test.ext.junit.runners.AndroidJUnit4
	import androidx.test.filters.SmallTest		import androidx.test.filters.SmallTest
	import com.android.systemui.SysuiTestCase		import com.android.systemui.SysuiTestCase
	@@ -25,8 +26,10 @@ import org.junit.Before
	import org.junit.Rule		import org.junit.Rule
	import org.junit.Test		import org.junit.Test
	import org.junit.runner.RunWith		import org.junit.runner.RunWith
			import org.mockito.ArgumentCaptor
	import org.mockito.ArgumentMatchers.any		import org.mockito.ArgumentMatchers.any
	import org.mockito.ArgumentMatchers.eq		import org.mockito.ArgumentMatchers.eq
			import org.mockito.Captor
	import org.mockito.Mock		import org.mockito.Mock
	import org.mockito.junit.MockitoJUnit		import org.mockito.junit.MockitoJUnit
	import org.mockito.junit.MockitoRule		import org.mockito.junit.MockitoRule
	@@ -43,21 +46,30 @@ class ExtraDimDialogManagerTest : SysuiTestCase() {
	@Mock private lateinit var activityStarter: ActivityStarter		@Mock private lateinit var activityStarter: ActivityStarter
	@Mock private lateinit var dialogProvider: Provider<ExtraDimDialogDelegate>		@Mock private lateinit var dialogProvider: Provider<ExtraDimDialogDelegate>
	@Mock private lateinit var dialogTransitionAnimator: DialogTransitionAnimator		@Mock private lateinit var dialogTransitionAnimator: DialogTransitionAnimator
			@Mock private lateinit var mainHandler: Handler
			@Captor private lateinit var runnableCaptor: ArgumentCaptor<Runnable>

	@Before		@Before
	fun setUp() {		fun setUp() {
	extraDimDialogManager =		extraDimDialogManager =
	ExtraDimDialogManager(dialogProvider, activityStarter, dialogTransitionAnimator)		ExtraDimDialogManager(
			dialogProvider,
			activityStarter,
			dialogTransitionAnimator,
			mainHandler,
			)
	}		}

	@Test		@Test
	fun dismissKeyguardIfNeededAndShowDialog_executeRunnableDismissingKeyguard() {		fun dismissKeyguardIfNeededAndShowDialog_executeRunnableDismissingKeyguard() {
	extraDimDialogManager.dismissKeyguardIfNeededAndShowDialog()		extraDimDialogManager.dismissKeyguardIfNeededAndShowDialog()
			verify(mainHandler).post(runnableCaptor.capture())
			runnableCaptor.value.run()
	verify(activityStarter)		verify(activityStarter)
	.executeRunnableDismissingKeyguard(		.executeRunnableDismissingKeyguard(
	any(),		any(),
	/* cancelAction= */ eq(null),		/* cancelAction= */ eq(null),
	/* dismissShade= */ eq(false),		/* dismissShade= */ eq(true),
	/* afterKeyguardGone= */ eq(true),		/* afterKeyguardGone= */ eq(true),
	/* deferred= */ eq(false),		/* deferred= */ eq(false),
	)		)

packages/SystemUI/src/com/android/systemui/accessibility/extradim/ExtraDimDialogManager.kt

+11 −7

Original line number	Original line	Diff line number	Diff line
	@@ -15,6 +15,7 @@
	*/		*/
	package com.android.systemui.accessibility.extradim		package com.android.systemui.accessibility.extradim

			import android.os.Handler
	import com.android.systemui.animation.DialogCuj		import com.android.systemui.animation.DialogCuj
	import com.android.systemui.animation.DialogTransitionAnimator		import com.android.systemui.animation.DialogTransitionAnimator
	import com.android.systemui.animation.Expandable		import com.android.systemui.animation.Expandable
	@@ -32,19 +33,22 @@ constructor(
	private val extraDimDialogDelegateProvider: Provider<ExtraDimDialogDelegate>,		private val extraDimDialogDelegateProvider: Provider<ExtraDimDialogDelegate>,
	private val mActivityStarter: ActivityStarter,		private val mActivityStarter: ActivityStarter,
	private val dialogTransitionAnimator: DialogTransitionAnimator,		private val dialogTransitionAnimator: DialogTransitionAnimator,
			private val mainHandler: Handler,
	) {		) {
	private var dialog: SystemUIDialog? = null		private var dialog: SystemUIDialog? = null

	@JvmOverloads		@JvmOverloads
	fun dismissKeyguardIfNeededAndShowDialog(expandable: Expandable? = null) {		fun dismissKeyguardIfNeededAndShowDialog(expandable: Expandable? = null) {
			mainHandler.post {
	mActivityStarter.executeRunnableDismissingKeyguard(		mActivityStarter.executeRunnableDismissingKeyguard(
	{ showRemoveExtraDimShortcutsDialog(expandable) },		{ showRemoveExtraDimShortcutsDialog(expandable) },
	/* cancelAction= */ null,		/* cancelAction= */ null,
	/* dismissShade= */ false,		/* dismissShade= */ true,
	/* afterKeyguardGone= */ true,		/* afterKeyguardGone= */ true,
	/* deferred= */ false,		/* deferred= */ false,
	)		)
	}		}
			}

	/** Show the dialog for removing all Extra Dim shortcuts. */		/** Show the dialog for removing all Extra Dim shortcuts. */
	private fun showRemoveExtraDimShortcutsDialog(expandable: Expandable?) {		private fun showRemoveExtraDimShortcutsDialog(expandable: Expandable?) {