Merge "Add falsing to QSTile long click" into udc-qpr-dev (a11934f8) · Commits · e / os / android_frameworks_base

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) {

+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++;