From 5641752fb14b0e281888176412aaa1dd150af642 Mon Sep 17 00:00:00 2001 From: Pat Manning Date: Wed, 20 Nov 2024 16:30:57 +0000 Subject: [PATCH] Remove selectability from pointer preferences. Fix: 379840620 Fix: 374902522 Fix: 374902467 Fix: 374898232 Fix: 374894728 Fix: 374894804 Test: Manual. Talkback, switch access, voice access. Flag: EXEMPT BugFix. Change-Id: I550bd78893124b453d49f98d51dab2f49bee84f7 --- res/xml/input_touchpad_three_finger_tap_customization.xml | 2 -- .../settings/inputmethod/PointerFillStylePreference.java | 1 + .../settings/inputmethod/PointerStrokeStylePreference.java | 1 + .../settings/inputmethod/TouchpadThreeFingerTapSelector.java | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/res/xml/input_touchpad_three_finger_tap_customization.xml b/res/xml/input_touchpad_three_finger_tap_customization.xml index f0103aeda73..74510811158 100644 --- a/res/xml/input_touchpad_three_finger_tap_customization.xml +++ b/res/xml/input_touchpad_three_finger_tap_customization.xml @@ -16,7 +16,6 @@ @@ -25,5 +24,4 @@ android:key="input_touchpad_three_finger_tap_preference" android:title="@string/three_finger_tap_preference_title"/> - diff --git a/src/com/android/settings/inputmethod/PointerFillStylePreference.java b/src/com/android/settings/inputmethod/PointerFillStylePreference.java index 52535f9321d..74284d64250 100644 --- a/src/com/android/settings/inputmethod/PointerFillStylePreference.java +++ b/src/com/android/settings/inputmethod/PointerFillStylePreference.java @@ -47,6 +47,7 @@ public class PointerFillStylePreference extends Preference { public PointerFillStylePreference(@NonNull Context context, @Nullable AttributeSet attrs) { super(context, attrs); setLayoutResource(R.layout.pointer_icon_fill_style_layout); + setSelectable(false); } @Override diff --git a/src/com/android/settings/inputmethod/PointerStrokeStylePreference.java b/src/com/android/settings/inputmethod/PointerStrokeStylePreference.java index 1c02332f8a1..fdbad929de2 100644 --- a/src/com/android/settings/inputmethod/PointerStrokeStylePreference.java +++ b/src/com/android/settings/inputmethod/PointerStrokeStylePreference.java @@ -38,6 +38,7 @@ public class PointerStrokeStylePreference extends Preference { public PointerStrokeStylePreference(@NonNull Context context, @Nullable AttributeSet attrs) { super(context, attrs); setLayoutResource(R.layout.pointer_icon_stroke_style_layout); + setSelectable(false); } @Override diff --git a/src/com/android/settings/inputmethod/TouchpadThreeFingerTapSelector.java b/src/com/android/settings/inputmethod/TouchpadThreeFingerTapSelector.java index 164098b808b..b56d2ead775 100644 --- a/src/com/android/settings/inputmethod/TouchpadThreeFingerTapSelector.java +++ b/src/com/android/settings/inputmethod/TouchpadThreeFingerTapSelector.java @@ -45,6 +45,7 @@ public class TouchpadThreeFingerTapSelector extends Preference { super(context, attrs); setLayoutResource(R.layout.touchpad_three_finger_tap_layout); mInputManager = context.getSystemService(InputManager.class); + setSelectable(false); } @Override