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

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

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

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

@@ -40,6 +40,7 @@ import android.widget.TextView;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settingslib.Utils;
 import com.android.systemui.R;
+import com.android.systemui.classifier.FalsingCollector;
 
 import java.util.List;
 
@@ -68,6 +69,7 @@ public class WalletView extends FrameLayout implements WalletCardCarousel.OnCard
     private boolean mIsUdfpsEnabled = false;
     private OnClickListener mDeviceLockedActionOnClickListener;
     private OnClickListener mShowWalletAppOnClickListener;
+    private FalsingCollector mFalsingCollector;
 
     public WalletView(Context context) {
         this(context, null);
@@ -329,4 +331,23 @@ public class WalletView extends FrameLayout implements WalletCardCarousel.OnCard
         String[] rawLabel = card.getLabel().toString().split("\\n");
         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;
+    }
 }