Merge "Add falsing to QSTile long click" into udc-qpr-dev
This commit is contained in:
@@ -330,8 +330,10 @@ public abstract class QSTileImpl<TState extends State> implements QSTile, Lifecy
|
|||||||
final int eventId = mClickEventId++;
|
final int eventId = mClickEventId++;
|
||||||
mQSLogger.logTileLongClick(mTileSpec, mStatusBarStateController.getState(), mState.state,
|
mQSLogger.logTileLongClick(mTileSpec, mStatusBarStateController.getState(), mState.state,
|
||||||
eventId);
|
eventId);
|
||||||
|
if (!mFalsingManager.isFalseLongTap(FalsingManager.LOW_PENALTY)) {
|
||||||
mHandler.obtainMessage(H.LONG_CLICK, eventId, 0, view).sendToTarget();
|
mHandler.obtainMessage(H.LONG_CLICK, eventId, 0, view).sendToTarget();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public LogMaker populate(LogMaker logMaker) {
|
public LogMaker populate(LogMaker logMaker) {
|
||||||
if (mState instanceof BooleanState) {
|
if (mState instanceof BooleanState) {
|
||||||
|
|||||||
@@ -203,6 +203,19 @@ public class QSTileImplTest extends SysuiTestCase {
|
|||||||
assertThat(mTile.mClicked).isTrue();
|
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
|
@Test
|
||||||
public void testSecondaryClick_Metrics() {
|
public void testSecondaryClick_Metrics() {
|
||||||
mTile.secondaryClick(null /* view */);
|
mTile.secondaryClick(null /* view */);
|
||||||
@@ -518,6 +531,7 @@ public class QSTileImplTest extends SysuiTestCase {
|
|||||||
}
|
}
|
||||||
private static class TileImpl extends QSTileImpl<QSTile.BooleanState> {
|
private static class TileImpl extends QSTileImpl<QSTile.BooleanState> {
|
||||||
boolean mClicked;
|
boolean mClicked;
|
||||||
|
boolean mLongClicked;
|
||||||
int mRefreshes = 0;
|
int mRefreshes = 0;
|
||||||
|
|
||||||
protected TileImpl(
|
protected TileImpl(
|
||||||
@@ -550,6 +564,11 @@ public class QSTileImplTest extends SysuiTestCase {
|
|||||||
mClicked = true;
|
mClicked = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void handleLongClick(@Nullable View view) {
|
||||||
|
mLongClicked = true;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void handleUpdateState(BooleanState state, Object arg) {
|
protected void handleUpdateState(BooleanState state, Object arg) {
|
||||||
mRefreshes++;
|
mRefreshes++;
|
||||||
|
|||||||
Reference in New Issue
Block a user