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

Commit b4099182 authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Android (Google) Code Review
Browse files

Merge "Duplicate call of logTapAction from merge" into tm-dev

parents e3c41047 7985b4ab

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -680,7 +680,6 @@ public class MediaControlPanel { 
                    button.setEnabled(true);

                    button.setEnabled(true);

                    button.setOnClickListener(v -> {

                    button.setOnClickListener(v -> {

                        if (!mFalsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) {

                        if (!mFalsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) {

                            mLogger.logTapAction(button.getId(), mUid, mPackageName, mInstanceId);

                            mLogger.logTapAction(button.getId(), mUid, mPackageName, mInstanceId);

                            mLogger.logTapAction(button.getId(), mUid, mPackageName, mInstanceId);

                            logSmartspaceCardReported(SMARTSPACE_CARD_CLICK_EVENT);

                            logSmartspaceCardReported(SMARTSPACE_CARD_CLICK_EVENT);

                            action.run();

                            action.run();

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -105,6 +105,7 @@ public class MediaControlPanelTest : SysuiTestCase() { 
    @Mock private lateinit var mediaOutputDialogFactory: MediaOutputDialogFactory

    @Mock private lateinit var mediaOutputDialogFactory: MediaOutputDialogFactory

    @Mock private lateinit var mediaCarouselController: MediaCarouselController

    @Mock private lateinit var mediaCarouselController: MediaCarouselController

    @Mock private lateinit var falsingManager: FalsingManager

    @Mock private lateinit var falsingManager: FalsingManager

    @Mock private lateinit var transitionParent: ViewGroup

    private lateinit var appIcon: ImageView

    private lateinit var appIcon: ImageView

    private lateinit var albumView: ImageView

    private lateinit var albumView: ImageView

    private lateinit var titleText: TextView

    private lateinit var titleText: TextView
@@ -242,6 +243,10 @@ public class MediaControlPanelTest : SysuiTestCase() { 
        whenever(viewHolder.seamlessText).thenReturn(seamlessText)

        whenever(viewHolder.seamlessText).thenReturn(seamlessText)

        whenever(viewHolder.seekBar).thenReturn(seekBar)

        whenever(viewHolder.seekBar).thenReturn(seekBar)





        // Transition View

        whenever(view.parent).thenReturn(transitionParent)

        whenever(view.rootView).thenReturn(transitionParent)



        // Action buttons

        // Action buttons

        whenever(viewHolder.actionPlayPause).thenReturn(actionPlayPause)

        whenever(viewHolder.actionPlayPause).thenReturn(actionPlayPause)

        whenever(viewHolder.getAction(R.id.actionPlayPause)).thenReturn(actionPlayPause)

        whenever(viewHolder.getAction(R.id.actionPlayPause)).thenReturn(actionPlayPause)