Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Ignore ACTION_OUTSIDE in FalsingManager" into tm-dev

Browse Source
This commit is contained in:
Dave Mankoff
2022-04-07 20:19:42 +00:00
committed by Android (Google) Code Review
parent 22149274f9 853d666fc8
commit a71729fbc4
5 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/classifier/FalsingCollectorImpl.java
View File

@@ -309,6 +309,10 @@ class FalsingCollectorImpl implements FalsingCollector {
avoidGesture();
return;
}
if (ev.getActionMasked() == MotionEvent.ACTION_OUTSIDE) {
return;
}
// We delay processing down events to see if another component wants to process them.
// If #avoidGesture is called after a MotionEvent.ACTION_DOWN, all following motion events
// will be ignored by the collector until another MotionEvent.ACTION_DOWN is passed in.

3
packages/SystemUI/src/com/android/systemui/wallet/ui/WalletActivity.java
View File

@@ -152,8 +152,7 @@ public class WalletActivity extends LifecycleActivity implements
Log.w(TAG, "Unable to create wallet app intent.");
return;
}
if (!mKeyguardStateController.isUnlocked()
&& mFalsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) {
if (mFalsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) {
return;
}

8
packages/SystemUI/src/com/android/systemui/wallet/ui/WalletCardCarousel.java
View File

@@ -81,6 +81,12 @@ public class WalletCardCarousel extends RecyclerView {
private float mCardCenterToScreenCenterDistancePx = Float.MAX_VALUE;
interface OnSelectionListener {
/**
* A non-centered card was clicked.
* @param position
*/
void onUncenteredClick(int position);
/**
* The card was moved to the center, thus selecting it.
*/
@@ -403,7 +409,7 @@ public class WalletCardCarousel extends RecyclerView {
viewHolder.mCardView.setOnClickListener(
v -> {
if (position != mCenteredAdapterPosition) {
smoothScrollToPosition(position);
mSelectionListener.onUncenteredClick(position);
} else {
mSelectionListener.onCardClicked(cardViewInfo);
}

11
packages/SystemUI/src/com/android/systemui/wallet/ui/WalletScreenController.java
View File

@@ -180,6 +180,14 @@ public class WalletScreenController implements
queryWalletCards();
}
@Override
public void onUncenteredClick(int position) {
if (mFalsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) {
return;
}
mCardCarousel.smoothScrollToPosition(position);
}
@Override
public void onCardSelected(@NonNull WalletCardViewInfo card) {
if (mIsDismissed) {
@@ -208,8 +216,7 @@ public class WalletScreenController implements
@Override
public void onCardClicked(@NonNull WalletCardViewInfo cardInfo) {
if (!mKeyguardStateController.isUnlocked()
&& mFalsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) {
if (mFalsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) {
return;
}
if (!(cardInfo instanceof QAWalletCardViewInfo)

14
packages/SystemUI/tests/src/com/android/systemui/classifier/FalsingCollectorImplTest.java
View File

@@ -198,6 +198,20 @@ public class FalsingCollectorImplTest extends SysuiTestCase {
verify(mFalsingDataProvider, never()).onMotionEvent(any(MotionEvent.class));
}
@Test
public void testIgnoreActionOutside() {
MotionEvent outside = MotionEvent.obtain(0, 0, MotionEvent.ACTION_OUTSIDE, 0, 0, 0);
MotionEvent up = MotionEvent.obtain(0, 0, MotionEvent.ACTION_UP, 0, 0, 0);
// Nothing passed initially. The outside event will be completely ignored.
mFalsingCollector.onTouchEvent(outside);
verify(mFalsingDataProvider, never()).onMotionEvent(any(MotionEvent.class));
// Up event flushes, and the outside event isn't passed through.
mFalsingCollector.onTouchEvent(up);
verify(mFalsingDataProvider).onMotionEvent(up);
}
@Test
public void testAvoidUnlocked() {
MotionEvent down = MotionEvent.obtain(0, 0, MotionEvent.ACTION_DOWN, 0, 0, 0);