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

Commit 57d14b22 authored by Michael Mikhail's avatar Michael Mikhail Committed by Automerger Merge Worker
Browse files

Merge "Add falsing to Long Clicks on UMO" into tm-qpr-dev am: 6a983b1e am: 416c8f61 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20393164



Change-Id: If79218fd56f37682137e34b42c2ff2fd2d538588
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5f552bb9 416c8f61

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

+3 −0
Original line number Diff line number Diff line
@@ -373,6 +373,7 @@ public class MediaControlPanel { 
        mMediaViewController.attach(player, MediaViewController.TYPE.PLAYER);



        vh.getPlayer().setOnLongClickListener(v -> {

            if (mFalsingManager.isFalseLongTap(FalsingManager.LOW_PENALTY)) return true;

            if (!mMediaViewController.isGutsVisible()) {

                openGuts();

                return true;
@@ -423,6 +424,7 @@ public class MediaControlPanel { 
        mMediaViewController.attach(recommendations, MediaViewController.TYPE.RECOMMENDATION);



        mRecommendationViewHolder.getRecommendations().setOnLongClickListener(v -> {

            if (mFalsingManager.isFalseLongTap(FalsingManager.LOW_PENALTY)) return true;

            if (!mMediaViewController.isGutsVisible()) {

                openGuts();

                return true;
@@ -1191,6 +1193,7 @@ public class MediaControlPanel { 
            setSmartspaceRecItemOnClickListener(mediaCoverContainer, recommendation, itemIndex);

            // Bubble up the long-click event to the card.

            mediaCoverContainer.setOnLongClickListener(v -> {

                if (mFalsingManager.isFalseLongTap(FalsingManager.LOW_PENALTY)) return true;

                View parent = (View) v.getParent();

                if (parent != null) {

                    parent.performLongClick();

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

+27 −0
Original line number Diff line number Diff line
@@ -1136,6 +1136,19 @@ public class MediaControlPanelTest : SysuiTestCase() { 


    /* ***** Guts tests for the player ***** */



    @Test

    fun player_longClick_isFalse() {

        whenever(falsingManager.isFalseLongTap(FalsingManager.LOW_PENALTY)).thenReturn(true)

        player.attachPlayer(viewHolder)



        val captor = ArgumentCaptor.forClass(View.OnLongClickListener::class.java)

        verify(viewHolder.player).onLongClickListener = captor.capture()



        captor.value.onLongClick(viewHolder.player)

        verify(mediaViewController, never()).openGuts()

        verify(mediaViewController, never()).closeGuts()

    }



    @Test

    fun player_longClickWhenGutsClosed_gutsOpens() {

        player.attachPlayer(viewHolder)
@@ -1315,6 +1328,20 @@ public class MediaControlPanelTest : SysuiTestCase() { 


    /* ***** Guts tests for the recommendations ***** */



    @Test

    fun recommendations_longClick_isFalse() {

        whenever(falsingManager.isFalseLongTap(FalsingManager.LOW_PENALTY)).thenReturn(true)

        player.attachRecommendation(recommendationViewHolder)

        player.bindRecommendation(smartspaceData)



        val captor = ArgumentCaptor.forClass(View.OnLongClickListener::class.java)

        verify(viewHolder.player).onLongClickListener = captor.capture()



        captor.value.onLongClick(viewHolder.player)

        verify(mediaViewController, never()).openGuts()

        verify(mediaViewController, never()).closeGuts()

    }



    @Test

    fun recommendations_longClickWhenGutsClosed_gutsOpens() {

        player.attachRecommendation(recommendationViewHolder)