Merge "Fix media having wrong expansion on QQS/landscape after fold/unfold" into tm-qpr-dev (668e9152) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/QuickQSPanelController.java

+7 −5

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ import java.util.List;

		import javax.inject.Inject;
		import javax.inject.Named;
		import javax.inject.Provider;

		/** Controller for {@link QuickQSPanel}. */
		@QSScope
		@@ -52,20 +53,21 @@ public class QuickQSPanelController extends QSPanelControllerBase<QuickQSPanel>
		}
		};

		private final boolean mUsingCollapsedLandscapeMedia;
		private final Provider<Boolean> mUsingCollapsedLandscapeMediaProvider;

		@Inject
		QuickQSPanelController(QuickQSPanel view, QSTileHost qsTileHost,
		QSCustomizerController qsCustomizerController,
		@Named(QS_USING_MEDIA_PLAYER) boolean usingMediaPlayer,
		@Named(QUICK_QS_PANEL) MediaHost mediaHost,
		@Named(QS_USING_COLLAPSED_LANDSCAPE_MEDIA) boolean usingCollapsedLandscapeMedia,
		@Named(QS_USING_COLLAPSED_LANDSCAPE_MEDIA)
		Provider<Boolean> usingCollapsedLandscapeMediaProvider,
		MetricsLogger metricsLogger, UiEventLogger uiEventLogger, QSLogger qsLogger,
		DumpManager dumpManager
		) {
		super(view, qsTileHost, qsCustomizerController, usingMediaPlayer, mediaHost, metricsLogger,
		uiEventLogger, qsLogger, dumpManager);
		mUsingCollapsedLandscapeMedia = usingCollapsedLandscapeMedia;
		mUsingCollapsedLandscapeMediaProvider = usingCollapsedLandscapeMediaProvider;
		}

		@Override
		@@ -80,7 +82,8 @@ public class QuickQSPanelController extends QSPanelControllerBase<QuickQSPanel>
		int rotation = getRotation();
		boolean isLandscape = rotation == RotationUtils.ROTATION_LANDSCAPE
		\|\| rotation == RotationUtils.ROTATION_SEASCAPE;
		if (!mUsingCollapsedLandscapeMedia \|\| !isLandscape) {
		boolean usingCollapsedLandscapeMedia = mUsingCollapsedLandscapeMediaProvider.get();
		if (!usingCollapsedLandscapeMedia \|\| !isLandscape) {
		mMediaHost.setExpansion(MediaHost.EXPANDED);
		} else {
		mMediaHost.setExpansion(MediaHost.COLLAPSED);
		@@ -126,7 +129,6 @@ public class QuickQSPanelController extends QSPanelControllerBase<QuickQSPanel>
		super.setTiles(tiles, /* collapsedView */ true);
		}

		/** */
		public void setContentMargins(int marginStart, int marginEnd) {
		mView.setContentMargins(marginStart, marginEnd, mMediaHost.getHostView());
		}

packages/SystemUI/tests/src/com/android/systemui/qs/QuickQSPanelControllerTest.kt

+60 −44

Original line number	Diff line number	Diff line
		@@ -17,8 +17,8 @@
		package com.android.systemui.qs

		import android.content.res.Configuration
		import android.test.suitebuilder.annotation.SmallTest
		import android.testing.AndroidTestingRunner
		import androidx.test.filters.SmallTest
		import com.android.internal.logging.MetricsLogger
		import com.android.internal.logging.testing.UiEventLoggerFake
		import com.android.systemui.SysuiTestCase
		@@ -38,38 +38,32 @@ import org.mockito.ArgumentCaptor
		import org.mockito.ArgumentMatchers.anyBoolean
		import org.mockito.Captor
		import org.mockito.Mock
		import org.mockito.Mockito.`when`
		import org.mockito.Mockito.any
		import org.mockito.Mockito.reset
		import org.mockito.Mockito.times
		import org.mockito.Mockito.verify
		import org.mockito.Mockito.`when` as whenever
		import org.mockito.MockitoAnnotations

		@SmallTest
		@RunWith(AndroidTestingRunner::class)
		class QuickQSPanelControllerTest : SysuiTestCase() {

		@Mock
		private lateinit var quickQSPanel: QuickQSPanel
		@Mock
		private lateinit var qsTileHost: QSTileHost
		@Mock
		private lateinit var qsCustomizerController: QSCustomizerController
		@Mock
		private lateinit var mediaHost: MediaHost
		@Mock
		private lateinit var metricsLogger: MetricsLogger
		@Mock private lateinit var quickQSPanel: QuickQSPanel
		@Mock private lateinit var qsTileHost: QSTileHost
		@Mock private lateinit var qsCustomizerController: QSCustomizerController
		@Mock private lateinit var mediaHost: MediaHost
		@Mock private lateinit var metricsLogger: MetricsLogger
		@Mock private lateinit var qsLogger: QSLogger
		@Mock private lateinit var tile: QSTile
		@Mock private lateinit var tileLayout: TileLayout
		@Mock private lateinit var tileView: QSTileView
		@Captor private lateinit var captor: ArgumentCaptor<QSPanel.OnConfigurationChangedListener>

		private val uiEventLogger = UiEventLoggerFake()
		@Mock
		private lateinit var qsLogger: QSLogger
		private val dumpManager = DumpManager()
		@Mock
		private lateinit var tile: QSTile
		@Mock
		private lateinit var tileLayout: TileLayout
		@Mock
		private lateinit var tileView: QSTileView
		@Captor
		private lateinit var captor: ArgumentCaptor<QSPanel.OnConfigurationChangedListener>

		private var usingCollapsedLandscapeMedia = true

		private lateinit var controller: TestQuickQSPanelController

		@@ -77,24 +71,24 @@ class QuickQSPanelControllerTest : SysuiTestCase() {
		fun setUp() {
		MockitoAnnotations.initMocks(this)

		`when`(quickQSPanel.tileLayout).thenReturn(tileLayout)
		`when`(quickQSPanel.isAttachedToWindow).thenReturn(true)
		`when`(quickQSPanel.dumpableTag).thenReturn("")
		`when`(quickQSPanel.resources).thenReturn(mContext.resources)
		`when`(qsTileHost.createTileView(any(), any(), anyBoolean())).thenReturn(tileView)
		whenever(quickQSPanel.tileLayout).thenReturn(tileLayout)
		whenever(quickQSPanel.isAttachedToWindow).thenReturn(true)
		whenever(quickQSPanel.dumpableTag).thenReturn("")
		whenever(quickQSPanel.resources).thenReturn(mContext.resources)
		whenever(qsTileHost.createTileView(any(), any(), anyBoolean())).thenReturn(tileView)

		controller = TestQuickQSPanelController(
		controller =
		TestQuickQSPanelController(
		quickQSPanel,
		qsTileHost,
		qsCustomizerController,
		false,
		/* usingMediaPlayer = */ false,
		mediaHost,
		true,
		{ usingCollapsedLandscapeMedia },
		metricsLogger,
		uiEventLogger,
		qsLogger,
		dumpManager
		)
		dumpManager)

		controller.init()
		}
		@@ -106,9 +100,9 @@ class QuickQSPanelControllerTest : SysuiTestCase() {

		@Test
		fun testTileSublistWithFewerTiles_noCrash() {
		`when`(quickQSPanel.numQuickTiles).thenReturn(3)
		whenever(quickQSPanel.numQuickTiles).thenReturn(3)

		`when`(qsTileHost.tiles).thenReturn(listOf(tile, tile))
		whenever(qsTileHost.tiles).thenReturn(listOf(tile, tile))

		controller.setTiles()
		}
		@@ -116,8 +110,8 @@ class QuickQSPanelControllerTest : SysuiTestCase() {
		@Test
		fun testTileSublistWithTooManyTiles() {
		val limit = 3
		`when`(quickQSPanel.numQuickTiles).thenReturn(limit)
		`when`(qsTileHost.tiles).thenReturn(listOf(tile, tile, tile, tile))
		whenever(quickQSPanel.numQuickTiles).thenReturn(limit)
		whenever(qsTileHost.tiles).thenReturn(listOf(tile, tile, tile, tile))

		controller.setTiles()

		@@ -125,39 +119,61 @@ class QuickQSPanelControllerTest : SysuiTestCase() {
		}

		@Test
		fun testMediaExpansionUpdatedWhenConfigurationChanged() {
		fun mediaExpansion_afterConfigChange_inLandscape_collapsedInLandscapeTrue_updatesToCollapsed() {
		// times(2) because both controller and base controller are registering their listeners
		verify(quickQSPanel, times(2)).addOnConfigurationChangedListener(captor.capture())

		// verify that media starts in the expanded state by default
		verify(mediaHost).expansion = MediaHostState.EXPANDED

		// Rotate device, verify media size updated
		// Rotate device, verify media size updated to collapsed
		usingCollapsedLandscapeMedia = true
		controller.setRotation(RotationUtils.ROTATION_LANDSCAPE)
		captor.allValues.forEach { it.onConfigurationChange(Configuration.EMPTY) }

		verify(mediaHost).expansion = MediaHostState.COLLAPSED
		}

		@Test
		fun mediaExpansion_afterConfigChange_landscape_collapsedInLandscapeFalse_remainsExpanded() {
		// times(2) because both controller and base controller are registering their listeners
		verify(quickQSPanel, times(2)).addOnConfigurationChangedListener(captor.capture())
		reset(mediaHost)

		usingCollapsedLandscapeMedia = false
		controller.setRotation(RotationUtils.ROTATION_LANDSCAPE)
		captor.allValues.forEach { it.onConfigurationChange(Configuration.EMPTY) }

		verify(mediaHost).expansion = MediaHostState.EXPANDED
		}

		class TestQuickQSPanelController(
		view: QuickQSPanel,
		qsTileHost: QSTileHost,
		qsCustomizerController: QSCustomizerController,
		usingMediaPlayer: Boolean,
		mediaHost: MediaHost,
		usingCollapsedLandscapeMedia: Boolean,
		usingCollapsedLandscapeMedia: () -> Boolean,
		metricsLogger: MetricsLogger,
		uiEventLogger: UiEventLoggerFake,
		qsLogger: QSLogger,
		dumpManager: DumpManager
		) : QuickQSPanelController(view, qsTileHost, qsCustomizerController, usingMediaPlayer,
		mediaHost, usingCollapsedLandscapeMedia, metricsLogger, uiEventLogger, qsLogger,
		) :
		QuickQSPanelController(
		view,
		qsTileHost,
		qsCustomizerController,
		usingMediaPlayer,
		mediaHost,
		usingCollapsedLandscapeMedia,
		metricsLogger,
		uiEventLogger,
		qsLogger,
		dumpManager) {

		private var rotation = RotationUtils.ROTATION_NONE

		@Override
		override fun getRotation(): Int = rotation
		@Override override fun getRotation(): Int = rotation

		fun setRotation(newRotation: Int) {
		rotation = newRotation