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

Commit a783ad70 authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Add falsing to QSTile long click" into udc-qpr-dev am: a11934f8 

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



Change-Id: Ia147eecac7fbbe329c84c85aa20caa12929d0f77
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents baeaa790 a11934f8

packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java

+3 −1
Original line number Diff line number Diff line
@@ -330,8 +330,10 @@ public abstract class QSTileImpl<TState extends State> implements QSTile, Lifecy 
        final int eventId = mClickEventId++;

        mQSLogger.logTileLongClick(mTileSpec, mStatusBarStateController.getState(), mState.state,

                eventId);

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

            mHandler.obtainMessage(H.LONG_CLICK, eventId, 0, view).sendToTarget();

        }

    }



    public LogMaker populate(LogMaker logMaker) {

        if (mState instanceof BooleanState) {

packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSTileImplTest.java

+19 −0
Original line number Diff line number Diff line
@@ -203,6 +203,19 @@ public class QSTileImplTest extends SysuiTestCase { 
        assertThat(mTile.mClicked).isTrue();

    }



    @Test

    public void testLongClick_falsing() {

        mFalsingManager.setFalseLongTap(true);

        mTile.longClick(null /* view */);

        mTestableLooper.processAllMessages();

        assertThat(mTile.mLongClicked).isFalse();



        mFalsingManager.setFalseLongTap(false);

        mTile.longClick(null /* view */);

        mTestableLooper.processAllMessages();

        assertThat(mTile.mLongClicked).isTrue();

    }



    @Test

    public void testSecondaryClick_Metrics() {

        mTile.secondaryClick(null /* view */);
@@ -518,6 +531,7 @@ public class QSTileImplTest extends SysuiTestCase { 
    }

    private static class TileImpl extends QSTileImpl<QSTile.BooleanState> {

        boolean mClicked;

        boolean mLongClicked;

        int mRefreshes = 0;



        protected TileImpl(
@@ -550,6 +564,11 @@ public class QSTileImplTest extends SysuiTestCase { 
            mClicked = true;

        }



        @Override

        protected void handleLongClick(@Nullable View view) {

            mLongClicked = true;

        }



        @Override

        protected void handleUpdateState(BooleanState state, Object arg) {

            mRefreshes++;