Fix android.appsecurity.cts.StorageHostTest#testFullDisk failed

UiAutomator create a motion event with button state 0, which
will be filtered out.  Here let 0 and BUTTON_STYLUS_PRIMARY could
be translated to KEYCODE_DPAD_CENTER.

Bug: 230555866
Change-Id: I1afb55eaccd289b647f753e53880d64812fa9a28

1 files changed, 9 insertions, 2 deletions

diff --git a/Settings/src/com/android/tv/settings/SettingsPreferenceFragment.java b/Settings/src/com/android/tv/settings/SettingsPreferenceFragment.java
index 98e76a39a..2f31da8e2 100644
--- a/Settings/src/com/android/tv/settings/SettingsPreferenceFragment.java
+++ b/Settings/src/com/android/tv/settings/SettingsPreferenceFragment.java
@@ -203,13 +203,13 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
                 }
                 vh.itemView.setOnTouchListener((v, e) -> {
                     if (e.getActionMasked() == MotionEvent.ACTION_DOWN
-                            && e.getButtonState() == MotionEvent.BUTTON_PRIMARY) {
+                            && isPrimaryKey(e.getButtonState())) {
                         vh.itemView.requestFocus();
                         v.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN,
                                 KeyEvent.KEYCODE_DPAD_CENTER));
                         return true;
                     } else if (e.getActionMasked() == MotionEvent.ACTION_UP
-                            && e.getButtonState() == MotionEvent.BUTTON_PRIMARY) {
+                            && isPrimaryKey(e.getButtonState())) {
                         v.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_UP,
                                 KeyEvent.KEYCODE_DPAD_CENTER));
                         return true;
@@ -316,4 +316,11 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
     protected int getPageId() {
         return TvSettingsEnums.PAGE_CLASSIC_DEFAULT;
     }
+
+    // check if such motion event should translate to key event DPAD_CENTER
+    private boolean isPrimaryKey(int buttonState) {
+        return buttonState == MotionEvent.BUTTON_PRIMARY
+                || buttonState == MotionEvent.BUTTON_STYLUS_PRIMARY
+                || buttonState == 0;  // motion events which creates by UI Automator
+    }
 }