Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 697b7b03 authored by Caitlin Cassidy's avatar Caitlin Cassidy
Browse files

[Media Recs] Remove smartspace cardinality method now that we only show 

3 albums at most.

Bug: 223603970
Test: MediaControlPanelTest
Change-Id: I4f49bb9653e333d84b2caf8319eefff2387dc1c1
parent c024662a

packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java

+2 −11
Original line number Diff line number Diff line
@@ -1288,7 +1288,7 @@ public class MediaControlPanel { 
            }

            logSmartspaceCardReported(SMARTSPACE_CARD_CLICK_EVENT,

                    interactedSubcardRank,

                    getSmartspaceSubCardCardinality());

                    mSmartspaceMediaItemsCount);



            if (shouldSmartspaceRecItemOpenInForeground(action)) {

                // Request to unlock the device if the activity needs to be opened in foreground.
@@ -1373,13 +1373,4 @@ public class MediaControlPanel { 
                interactedSubcardRank,

                interactedSubcardCardinality);

    }



    private int getSmartspaceSubCardCardinality() {

        if (!mMediaCarouselController.getMediaCarouselScrollHandler().getQsExpanded()

                && mSmartspaceMediaItemsCount > 3) {

            return 3;

        }



        return mSmartspaceMediaItemsCount;

    }

}

packages/SystemUI/tests/src/com/android/systemui/media/MediaControlPanelTest.kt

+0 −4
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ public class MediaControlPanelTest : SysuiTestCase() { 
    @Mock private lateinit var collapsedSet: ConstraintSet

    @Mock private lateinit var mediaOutputDialogFactory: MediaOutputDialogFactory

    @Mock private lateinit var mediaCarouselController: MediaCarouselController

    @Mock private lateinit var mediaCarouselScrollHandler: MediaCarouselScrollHandler

    @Mock private lateinit var falsingManager: FalsingManager

    @Mock private lateinit var transitionParent: ViewGroup

    private lateinit var appIcon: ImageView
@@ -294,9 +293,6 @@ public class MediaControlPanelTest : SysuiTestCase() { 
     */

    private fun initMediaViewHolderMocks() {

        whenever(seekBarViewModel.progress).thenReturn(seekBarData)

        whenever(mediaCarouselController.mediaCarouselScrollHandler)

            .thenReturn(mediaCarouselScrollHandler)

        whenever(mediaCarouselScrollHandler.qsExpanded).thenReturn(false)



        // Set up mock views for the players

        appIcon = ImageView(context)