diff options
8 files changed, 14 insertions, 104 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt b/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt index f8c6a5791839..8368792b8ae3 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt +++ b/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt @@ -149,32 +149,6 @@ class MediaCarouselController @Inject constructor( } } } - - companion object { - private const val SQUISHINESS_SCALE_START = 0.5 - private const val SQUISHINESS_SCALE_FACTOR = 0.5 - private fun getSquishinessScale(squishinessFraction: Float): Double { - return SQUISHINESS_SCALE_START + SQUISHINESS_SCALE_FACTOR * squishinessFraction - } - } - - var squishinessFraction: Float = 1f - set(value) { - if (field == value) { - return - } - field = value - - val scale = getSquishinessScale(field) - for (mediaPlayer in MediaPlayerData.players()) { - mediaPlayer.mediaViewHolder?.let { - it.player.bottom = it.player.top + (scale * it.player.measuredHeight).toInt() - } ?: mediaPlayer.recommendationViewHolder?.let { - it.recommendations.bottom = it.recommendations.top + - (scale * it.recommendations.measuredHeight).toInt() - } - } - } private val configListener = object : ConfigurationController.ConfigurationListener { override fun onDensityOrFontScaleChanged() { // System font changes should only happen when UMO is offscreen or a flicker may occur diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanelController.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanelController.java index f41b905775e4..18bd6b7b3c32 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSPanelController.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanelController.java @@ -27,7 +27,6 @@ import android.view.View; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.UiEventLogger; import com.android.systemui.dump.DumpManager; -import com.android.systemui.media.MediaCarouselController; import com.android.systemui.media.MediaHierarchyManager; import com.android.systemui.media.MediaHost; import com.android.systemui.media.MediaHostState; @@ -76,14 +75,13 @@ public class QSPanelController extends QSPanelControllerBase<QSPanel> { @Named(QS_USING_MEDIA_PLAYER) boolean usingMediaPlayer, @Named(QS_PANEL) MediaHost mediaHost, QSTileRevealController.Factory qsTileRevealControllerFactory, - DumpManager dumpManager, MediaCarouselController mediaCarouselController, - MetricsLogger metricsLogger, UiEventLogger uiEventLogger, + DumpManager dumpManager, MetricsLogger metricsLogger, UiEventLogger uiEventLogger, QSLogger qsLogger, BrightnessController.Factory brightnessControllerFactory, BrightnessSliderController.Factory brightnessSliderFactory, FalsingManager falsingManager, StatusBarKeyguardViewManager statusBarKeyguardViewManager) { super(view, qstileHost, qsCustomizerController, usingMediaPlayer, mediaHost, - metricsLogger, uiEventLogger, qsLogger, dumpManager, mediaCarouselController); + metricsLogger, uiEventLogger, qsLogger, dumpManager); mTunerService = tunerService; mQsCustomizerController = qsCustomizerController; mQsTileRevealControllerFactory = qsTileRevealControllerFactory; diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanelControllerBase.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanelControllerBase.java index a5c60a417a05..ded466a0cb25 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSPanelControllerBase.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanelControllerBase.java @@ -32,7 +32,6 @@ import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.UiEventLogger; import com.android.systemui.Dumpable; import com.android.systemui.dump.DumpManager; -import com.android.systemui.media.MediaCarouselController; import com.android.systemui.media.MediaHost; import com.android.systemui.plugins.qs.QSTile; import com.android.systemui.plugins.qs.QSTileView; @@ -71,7 +70,6 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr private final UiEventLogger mUiEventLogger; private final QSLogger mQSLogger; private final DumpManager mDumpManager; - private final MediaCarouselController mMediaCarouselController; protected final ArrayList<TileRecord> mRecords = new ArrayList<>(); protected boolean mShouldUseSplitNotificationShade; @@ -133,8 +131,7 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr MetricsLogger metricsLogger, UiEventLogger uiEventLogger, QSLogger qsLogger, - DumpManager dumpManager, - MediaCarouselController mediaCarouselController + DumpManager dumpManager ) { super(view); mHost = host; @@ -147,7 +144,6 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr mDumpManager = dumpManager; mShouldUseSplitNotificationShade = LargeScreenUtils.shouldUseSplitNotificationShade(getResources()); - mMediaCarouselController = mediaCarouselController; } @Override @@ -165,7 +161,6 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr public void setSquishinessFraction(float squishinessFraction) { mView.setSquishinessFraction(squishinessFraction); - mMediaCarouselController.setSquishinessFraction(squishinessFraction); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanelController.java b/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanelController.java index 7ce0ad04bb75..9739974256f6 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanelController.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanelController.java @@ -26,7 +26,6 @@ import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.UiEventLogger; import com.android.systemui.R; import com.android.systemui.dump.DumpManager; -import com.android.systemui.media.MediaCarouselController; import com.android.systemui.media.MediaHierarchyManager; import com.android.systemui.media.MediaHost; import com.android.systemui.plugins.qs.QSTile; @@ -56,10 +55,10 @@ public class QuickQSPanelController extends QSPanelControllerBase<QuickQSPanel> @Named(QS_USING_COLLAPSED_LANDSCAPE_MEDIA) Provider<Boolean> usingCollapsedLandscapeMediaProvider, MetricsLogger metricsLogger, UiEventLogger uiEventLogger, QSLogger qsLogger, - DumpManager dumpManager, MediaCarouselController mediaCarouselController + DumpManager dumpManager ) { super(view, qsTileHost, qsCustomizerController, usingMediaPlayer, mediaHost, metricsLogger, - uiEventLogger, qsLogger, dumpManager, mediaCarouselController); + uiEventLogger, qsLogger, dumpManager); mUsingCollapsedLandscapeMediaProvider = usingCollapsedLandscapeMediaProvider; } diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/MediaCarouselControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/MediaCarouselControllerTest.kt index e3e3b7413157..5ad354247a04 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/MediaCarouselControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/MediaCarouselControllerTest.kt @@ -30,7 +30,6 @@ import com.android.systemui.plugins.FalsingManager import com.android.systemui.statusbar.notification.collection.provider.OnReorderingAllowedListener import com.android.systemui.statusbar.notification.collection.provider.VisualStabilityProvider import com.android.systemui.statusbar.policy.ConfigurationController -import com.android.systemui.util.animation.TransitionLayout import com.android.systemui.util.concurrency.DelayableExecutor import com.android.systemui.util.mockito.capture import com.android.systemui.util.mockito.eq @@ -46,7 +45,6 @@ import org.mockito.Captor import org.mockito.Mock import org.mockito.Mockito.mock import org.mockito.Mockito.verify -import org.mockito.Mockito.verifyNoMoreInteractions import org.mockito.Mockito.`when` as whenever import org.mockito.MockitoAnnotations @@ -73,10 +71,6 @@ class MediaCarouselControllerTest : SysuiTestCase() { @Mock lateinit var dumpManager: DumpManager @Mock lateinit var logger: MediaUiEventLogger @Mock lateinit var debugLogger: MediaCarouselControllerLogger - @Mock lateinit var mediaViewHolder: MediaViewHolder - @Mock lateinit var player: TransitionLayout - @Mock lateinit var recommendationViewHolder: RecommendationViewHolder - @Mock lateinit var recommendations: TransitionLayout @Mock lateinit var mediaPlayer: MediaControlPanel @Mock lateinit var mediaViewController: MediaViewController @Mock lateinit var smartspaceMediaData: SmartspaceMediaData @@ -282,46 +276,6 @@ class MediaCarouselControllerTest : SysuiTestCase() { verify(logger).logRecommendationRemoved(eq(packageName), eq(instanceId!!)) } - @Test - fun testSetSquishinessFractionForMedia_setPlayerBottom() { - whenever(panel.mediaViewHolder).thenReturn(mediaViewHolder) - whenever(mediaViewHolder.player).thenReturn(player) - whenever(player.measuredHeight).thenReturn(100) - - val playingLocal = Triple("playing local", - DATA.copy(active = true, isPlaying = true, - playbackLocation = MediaData.PLAYBACK_LOCAL, resumption = false), - 4500L) - MediaPlayerData.addMediaPlayer(playingLocal.first, playingLocal.second, panel, clock, - false, debugLogger) - - mediaCarouselController.squishinessFraction = 0.0f - verify(player).bottom = 50 - verifyNoMoreInteractions(recommendationViewHolder) - - mediaCarouselController.squishinessFraction = 0.5f - verify(player).bottom = 75 - verifyNoMoreInteractions(recommendationViewHolder) - } - - @Test - fun testSetSquishinessFractionForRecommendation_setPlayerBottom() { - whenever(panel.recommendationViewHolder).thenReturn(recommendationViewHolder) - whenever(recommendationViewHolder.recommendations).thenReturn(recommendations) - whenever(recommendations.measuredHeight).thenReturn(100) - - MediaPlayerData.addMediaRecommendation(SMARTSPACE_KEY, EMPTY_SMARTSPACE_MEDIA_DATA, panel, - false, clock) - - mediaCarouselController.squishinessFraction = 0.0f - verifyNoMoreInteractions(mediaViewHolder) - verify(recommendationViewHolder.recommendations).bottom = 50 - - mediaCarouselController.squishinessFraction = 0.5f - verifyNoMoreInteractions(mediaViewHolder) - verify(recommendationViewHolder.recommendations).bottom = 75 - } - fun testMediaLoaded_ScrollToActivePlayer() { listener.value.onMediaDataLoaded("playing local", null, diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelControllerBaseTest.java index cbe118635e95..3cad2a005882 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelControllerBaseTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelControllerBaseTest.java @@ -44,7 +44,6 @@ import com.android.internal.logging.testing.UiEventLoggerFake; import com.android.systemui.R; import com.android.systemui.SysuiTestCase; import com.android.systemui.dump.DumpManager; -import com.android.systemui.media.MediaCarouselController; import com.android.systemui.media.MediaHost; import com.android.systemui.plugins.qs.QSTile; import com.android.systemui.plugins.qs.QSTileView; @@ -87,7 +86,6 @@ public class QSPanelControllerBaseTest extends SysuiTestCase { @Mock private QSLogger mQSLogger; private DumpManager mDumpManager = new DumpManager(); - private MediaCarouselController mMediaCarouselController; @Mock QSTileImpl mQSTile; @Mock @@ -110,9 +108,9 @@ public class QSPanelControllerBaseTest extends SysuiTestCase { protected TestableQSPanelControllerBase(QSPanel view, QSTileHost host, QSCustomizerController qsCustomizerController, MediaHost mediaHost, MetricsLogger metricsLogger, UiEventLogger uiEventLogger, QSLogger qsLogger, - DumpManager dumpManager, MediaCarouselController mediaCarouselController) { + DumpManager dumpManager) { super(view, host, qsCustomizerController, true, mediaHost, metricsLogger, uiEventLogger, - qsLogger, dumpManager, mediaCarouselController); + qsLogger, dumpManager); } @Override @@ -146,7 +144,7 @@ public class QSPanelControllerBaseTest extends SysuiTestCase { mController = new TestableQSPanelControllerBase(mQSPanel, mQSTileHost, mQSCustomizerController, mMediaHost, - mMetricsLogger, mUiEventLogger, mQSLogger, mDumpManager, mMediaCarouselController); + mMetricsLogger, mUiEventLogger, mQSLogger, mDumpManager); mController.init(); reset(mQSTileRevealController); @@ -158,7 +156,7 @@ public class QSPanelControllerBaseTest extends SysuiTestCase { QSPanelControllerBase<QSPanel> controller = new TestableQSPanelControllerBase(mQSPanel, mQSTileHost, mQSCustomizerController, mMediaHost, - mMetricsLogger, mUiEventLogger, mQSLogger, mDumpManager, mMediaCarouselController) { + mMetricsLogger, mUiEventLogger, mQSLogger, mDumpManager) { @Override protected QSTileRevealController createTileRevealController() { return mQSTileRevealController; @@ -253,7 +251,7 @@ public class QSPanelControllerBaseTest extends SysuiTestCase { when(mQSPanel.getDumpableTag()).thenReturn("QSPanelLandscape"); mController = new TestableQSPanelControllerBase(mQSPanel, mQSTileHost, mQSCustomizerController, mMediaHost, - mMetricsLogger, mUiEventLogger, mQSLogger, mDumpManager, mMediaCarouselController); + mMetricsLogger, mUiEventLogger, mQSLogger, mDumpManager); mController.init(); assertThat(mController.shouldUseHorizontalLayout()).isTrue(); @@ -262,7 +260,7 @@ public class QSPanelControllerBaseTest extends SysuiTestCase { when(mQSPanel.getDumpableTag()).thenReturn("QSPanelPortrait"); mController = new TestableQSPanelControllerBase(mQSPanel, mQSTileHost, mQSCustomizerController, mMediaHost, - mMetricsLogger, mUiEventLogger, mQSLogger, mDumpManager, mMediaCarouselController); + mMetricsLogger, mUiEventLogger, mQSLogger, mDumpManager); mController.init(); assertThat(mController.shouldUseHorizontalLayout()).isFalse(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelControllerTest.kt index 98d499a70fa7..5eb9a9862340 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelControllerTest.kt @@ -6,7 +6,6 @@ import com.android.internal.logging.MetricsLogger import com.android.internal.logging.UiEventLogger import com.android.systemui.SysuiTestCase import com.android.systemui.dump.DumpManager -import com.android.systemui.media.MediaCarouselController import com.android.systemui.media.MediaHost import com.android.systemui.media.MediaHostState import com.android.systemui.plugins.FalsingManager @@ -41,7 +40,6 @@ class QSPanelControllerTest : SysuiTestCase() { @Mock private lateinit var qsCustomizerController: QSCustomizerController @Mock private lateinit var qsTileRevealControllerFactory: QSTileRevealController.Factory @Mock private lateinit var dumpManager: DumpManager - @Mock private lateinit var mediaCarouselController: MediaCarouselController @Mock private lateinit var metricsLogger: MetricsLogger @Mock private lateinit var uiEventLogger: UiEventLogger @Mock private lateinit var qsLogger: QSLogger @@ -78,7 +76,6 @@ class QSPanelControllerTest : SysuiTestCase() { mediaHost, qsTileRevealControllerFactory, dumpManager, - mediaCarouselController, metricsLogger, uiEventLogger, qsLogger, diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QuickQSPanelControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/QuickQSPanelControllerTest.kt index 4af5b9018d5a..6af8e4904a1e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QuickQSPanelControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QuickQSPanelControllerTest.kt @@ -23,7 +23,6 @@ import com.android.internal.logging.MetricsLogger import com.android.internal.logging.testing.UiEventLoggerFake import com.android.systemui.SysuiTestCase import com.android.systemui.dump.DumpManager -import com.android.systemui.media.MediaCarouselController import com.android.systemui.media.MediaHost import com.android.systemui.media.MediaHostState import com.android.systemui.plugins.qs.QSTile @@ -60,7 +59,6 @@ class QuickQSPanelControllerTest : SysuiTestCase() { @Mock private lateinit var tileLayout: TileLayout @Mock private lateinit var tileView: QSTileView @Captor private lateinit var captor: ArgumentCaptor<QSPanel.OnConfigurationChangedListener> - @Mock private lateinit var mediaCarouselController: MediaCarouselController private val uiEventLogger = UiEventLoggerFake() private val dumpManager = DumpManager() @@ -90,8 +88,7 @@ class QuickQSPanelControllerTest : SysuiTestCase() { metricsLogger, uiEventLogger, qsLogger, - dumpManager, - mediaCarouselController) + dumpManager) controller.init() } @@ -158,8 +155,7 @@ class QuickQSPanelControllerTest : SysuiTestCase() { metricsLogger: MetricsLogger, uiEventLogger: UiEventLoggerFake, qsLogger: QSLogger, - dumpManager: DumpManager, - mediaCarouselController: MediaCarouselController + dumpManager: DumpManager ) : QuickQSPanelController( view, @@ -171,8 +167,7 @@ class QuickQSPanelControllerTest : SysuiTestCase() { metricsLogger, uiEventLogger, qsLogger, - dumpManager, - mediaCarouselController) { + dumpManager) { private var rotation = RotationUtils.ROTATION_NONE |