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

Commit 92a27506 authored by Michael Mikhail's avatar Michael Mikhail Committed by Automerger Merge Worker
Browse files

Merge "Remove MEDIA_FALSING_PENALTY flag" into udc-dev am: 55a04817 am: 12e3835b am: a9718db5 

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



Change-Id: I877ee126c59851cfea5fc3050fd99277939c4aee
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7d78d70a a9718db5

packages/SystemUI/src/com/android/systemui/classifier/BrightLineFalsingManager.java

+1 −2
Original line number Diff line number Diff line
@@ -232,8 +232,7 @@ public class BrightLineFalsingManager implements FalsingManager { 


        // check for false tap if it is a seekbar interaction

        if (interactionType == MEDIA_SEEKBAR) {

            localResult[0] &= isFalseTap(mFeatureFlags.isEnabled(Flags.MEDIA_FALSING_PENALTY)

                    ? FalsingManager.MODERATE_PENALTY : FalsingManager.LOW_PENALTY);

            localResult[0] &= isFalseTap(FalsingManager.MODERATE_PENALTY);

        }



        logDebug("False Gesture (type: " + interactionType + "): " + localResult[0]);

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −2
Original line number Diff line number Diff line
@@ -387,8 +387,6 @@ object Flags { 
    // TODO(b/254513168): Tracking Bug

    @JvmField val UMO_SURFACE_RIPPLE = releasedFlag(907, "umo_surface_ripple")



    @JvmField val MEDIA_FALSING_PENALTY = releasedFlag(908, "media_falsing_media")



    // TODO(b/261734857): Tracking Bug

    @JvmField val UMO_TURBULENCE_NOISE = releasedFlag(909, "umo_turbulence_noise")

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

+2 −8
Original line number Diff line number Diff line
@@ -617,10 +617,7 @@ public class MediaControlPanel { 
        seamlessView.setContentDescription(deviceString);

        seamlessView.setOnClickListener(

                v -> {

                    if (mFalsingManager.isFalseTap(

                            mFeatureFlags.isEnabled(Flags.MEDIA_FALSING_PENALTY)

                                    ? FalsingManager.MODERATE_PENALTY :

                                    FalsingManager.LOW_PENALTY)) {

                    if (mFalsingManager.isFalseTap(FalsingManager.MODERATE_PENALTY)) {

                        return;

                    }
@@ -1130,10 +1127,7 @@ public class MediaControlPanel { 
            } else {

                button.setEnabled(true);

                button.setOnClickListener(v -> {

                    if (!mFalsingManager.isFalseTap(

                            mFeatureFlags.isEnabled(Flags.MEDIA_FALSING_PENALTY)

                                    ? FalsingManager.MODERATE_PENALTY :

                                    FalsingManager.LOW_PENALTY)) {

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

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

                        logSmartspaceCardReported(SMARTSPACE_CARD_CLICK_EVENT);

                        action.run();

packages/SystemUI/tests/src/com/android/systemui/classifier/BrightLineClassifierTest.java

+0 −1
Original line number Diff line number Diff line
@@ -120,7 +120,6 @@ public class BrightLineClassifierTest extends SysuiTestCase { 
                gestureCompleteListenerCaptor.capture());



        mGestureFinalizedListener = gestureCompleteListenerCaptor.getValue();

        mFakeFeatureFlags.set(Flags.MEDIA_FALSING_PENALTY, true);

        mFakeFeatureFlags.set(Flags.FALSING_OFF_FOR_UNFOLDED, true);

    }

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

+0 −1
Original line number Diff line number Diff line
@@ -230,7 +230,6 @@ public class MediaControlPanelTest : SysuiTestCase() { 
        FakeFeatureFlags().apply {

            this.set(Flags.UMO_SURFACE_RIPPLE, false)

            this.set(Flags.UMO_TURBULENCE_NOISE, false)

            this.set(Flags.MEDIA_FALSING_PENALTY, true)

            this.set(Flags.MEDIA_EXPLICIT_INDICATOR, true)

            this.set(Flags.MEDIA_RECOMMENDATION_CARD_UPDATE, false)

        }