diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-03-29 03:51:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-29 03:51:50 +0000 |
| commit | 436d76fdfea89d393bd7f967cefcb5587c3f4819 (patch) | |
| tree | f4fdaccad51bc79b2ad56e79a60c82ff7007776c | |
| parent | 783cb5b67b7ef128218aefa71637d3ce28d129e5 (diff) | |
| parent | cd665b001a1c33a26363a71e8839d33605496081 (diff) | |
| download | TvSettings-436d76fdfea89d393bd7f967cefcb5587c3f4819.tar.gz | |
Merge "Enter corresponding fragment by mouse primary key only" into main
| -rw-r--r-- | Settings/src/com/android/tv/settings/SettingsPreferenceFragment.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Settings/src/com/android/tv/settings/SettingsPreferenceFragment.java b/Settings/src/com/android/tv/settings/SettingsPreferenceFragment.java index 28a94fff6..98e76a39a 100644 --- a/Settings/src/com/android/tv/settings/SettingsPreferenceFragment.java +++ b/Settings/src/com/android/tv/settings/SettingsPreferenceFragment.java @@ -202,12 +202,14 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF getContext(), R.animator.preference)); } vh.itemView.setOnTouchListener((v, e) -> { - if (e.getActionMasked() == MotionEvent.ACTION_DOWN) { + if (e.getActionMasked() == MotionEvent.ACTION_DOWN + && e.getButtonState() == MotionEvent.BUTTON_PRIMARY) { vh.itemView.requestFocus(); v.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_CENTER)); return true; - } else if (e.getActionMasked() == MotionEvent.ACTION_UP) { + } else if (e.getActionMasked() == MotionEvent.ACTION_UP + && e.getButtonState() == MotionEvent.BUTTON_PRIMARY) { v.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DPAD_CENTER)); return true; |