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

Merge "Ensure taps are capture for falsing in the Wallet Activity." into sc-dev

Browse Source
This commit is contained in:
Dave Mankoff
2021-07-02 13:24:48 +00:00
committed by Android (Google) Code Review
parent b2a201b7e1 1a96ecb0c5
commit 267216bdb0
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,6 +38,7 @@ import com.android.keyguard.KeyguardUpdateMonitor;
import com.android.keyguard.KeyguardUpdateMonitorCallback; import com.android.keyguard.KeyguardUpdateMonitorCallback;
import com.android.settingslib.Utils; import com.android.settingslib.Utils;
import com.android.systemui.R; import com.android.systemui.R;
import com.android.systemui.classifier.FalsingCollector;
import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.dagger.qualifiers.Background;
import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.dagger.qualifiers.Main;
import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.plugins.ActivityStarter;
@@ -65,6 +66,7 @@ public class WalletActivity extends LifecycleActivity implements
private final Executor mExecutor; private final Executor mExecutor;
private final Handler mHandler; private final Handler mHandler;
private final FalsingManager mFalsingManager; private final FalsingManager mFalsingManager;
private FalsingCollector mFalsingCollector;
private final UserTracker mUserTracker; private final UserTracker mUserTracker;
private final KeyguardUpdateMonitor mKeyguardUpdateMonitor; private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;
private final StatusBarKeyguardViewManager mKeyguardViewManager; private final StatusBarKeyguardViewManager mKeyguardViewManager;
@@ -82,6 +84,7 @@ public class WalletActivity extends LifecycleActivity implements
@Background Executor executor, @Background Executor executor,
@Main Handler handler, @Main Handler handler,
FalsingManager falsingManager, FalsingManager falsingManager,
FalsingCollector falsingCollector,
UserTracker userTracker, UserTracker userTracker,
KeyguardUpdateMonitor keyguardUpdateMonitor, KeyguardUpdateMonitor keyguardUpdateMonitor,
StatusBarKeyguardViewManager keyguardViewManager) { StatusBarKeyguardViewManager keyguardViewManager) {
@@ -91,6 +94,7 @@ public class WalletActivity extends LifecycleActivity implements
mExecutor = executor; mExecutor = executor;
mHandler = handler; mHandler = handler;
mFalsingManager = falsingManager; mFalsingManager = falsingManager;
mFalsingCollector = falsingCollector;
mUserTracker = userTracker; mUserTracker = userTracker;
mKeyguardUpdateMonitor = keyguardUpdateMonitor; mKeyguardUpdateMonitor = keyguardUpdateMonitor;
mKeyguardViewManager = keyguardViewManager; mKeyguardViewManager = keyguardViewManager;
@@ -136,6 +140,7 @@ public class WalletActivity extends LifecycleActivity implements
} }
}; };
walletView.setFalsingCollector(mFalsingCollector);
walletView.setShowWalletAppOnClickListener( walletView.setShowWalletAppOnClickListener(
v -> { v -> {
if (mWalletClient.createWalletIntent() == null) { if (mWalletClient.createWalletIntent() == null) {

21
packages/SystemUI/src/com/android/systemui/wallet/ui/WalletView.java
View File

@@ -40,6 +40,7 @@ import android.widget.TextView;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.settingslib.Utils; import com.android.settingslib.Utils;
import com.android.systemui.R; import com.android.systemui.R;
import com.android.systemui.classifier.FalsingCollector;
import java.util.List; import java.util.List;
@@ -68,6 +69,7 @@ public class WalletView extends FrameLayout implements WalletCardCarousel.OnCard
private boolean mIsUdfpsEnabled = false; private boolean mIsUdfpsEnabled = false;
private OnClickListener mDeviceLockedActionOnClickListener; private OnClickListener mDeviceLockedActionOnClickListener;
private OnClickListener mShowWalletAppOnClickListener; private OnClickListener mShowWalletAppOnClickListener;
private FalsingCollector mFalsingCollector;
public WalletView(Context context) { public WalletView(Context context) {
this(context, null); this(context, null);
@@ -329,4 +331,23 @@ public class WalletView extends FrameLayout implements WalletCardCarousel.OnCard
String[] rawLabel = card.getLabel().toString().split("\\n"); String[] rawLabel = card.getLabel().toString().split("\\n");
return rawLabel.length == 2 ? rawLabel[1] : null; return rawLabel.length == 2 ? rawLabel[1] : null;
} }
@Override
public boolean dispatchTouchEvent(MotionEvent ev) {
if (mFalsingCollector != null) {
mFalsingCollector.onTouchEvent(ev);
}
boolean result = super.dispatchTouchEvent(ev);
if (mFalsingCollector != null) {
mFalsingCollector.onMotionEventComplete();
}
return result;
}
public void setFalsingCollector(FalsingCollector falsingCollector) {
mFalsingCollector = falsingCollector;
}
} }