Update Touchpad settings page to include mouse.
Make each setting conditionally available based on touchpad or mouse connected to device. Bug: 269100659 Test: TrackpadBottomPreferenceControllerTest Test: TrackpadReverseScrollingPreferenceControllerTest Test: TrackpadTapToClickPreferenceControllerTest Test: TrackpadSettingsControllerTest Flag: android.view.flags.enable_vector_cursor_a11y_settings Change-Id: I601c29e20d69227779481c0a491256e36cfd268f
This commit is contained in:
@@ -39,7 +39,7 @@
|
|||||||
|
|
||||||
<Preference
|
<Preference
|
||||||
android:key="trackpad_settings"
|
android:key="trackpad_settings"
|
||||||
android:title="@string/trackpad_settings"
|
android:title="@string/trackpad_mouse_settings"
|
||||||
android:summary="@string/trackpad_settings_summary"
|
android:summary="@string/trackpad_settings_summary"
|
||||||
android:icon="@drawable/ic_settings_trackpad"
|
android:icon="@drawable/ic_settings_trackpad"
|
||||||
android:order="-254"
|
android:order="-254"
|
||||||
|
@@ -18,7 +18,7 @@
|
|||||||
<PreferenceScreen
|
<PreferenceScreen
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
||||||
android:title="@string/trackpad_settings">
|
android:title="@string/trackpad_mouse_settings">
|
||||||
<Preference
|
<Preference
|
||||||
android:key="trackpad_gesture_settings"
|
android:key="trackpad_gesture_settings"
|
||||||
android:title="@string/trackpad_touchpad_gesture_title"
|
android:title="@string/trackpad_touchpad_gesture_title"
|
||||||
|
@@ -66,6 +66,20 @@ public class NewKeyboardSettingsUtils {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static boolean isMouse() {
|
||||||
|
for (int deviceId : InputDevice.getDeviceIds()) {
|
||||||
|
final InputDevice device = InputDevice.getDevice(deviceId);
|
||||||
|
if (device == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if ((device.getSources() & InputDevice.SOURCE_MOUSE)
|
||||||
|
== InputDevice.SOURCE_MOUSE) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
@SuppressLint("MissingPermission")
|
@SuppressLint("MissingPermission")
|
||||||
@Nullable
|
@Nullable
|
||||||
static String getSelectedKeyboardLayoutLabelForUser(Context context, @UserIdInt int userId,
|
static String getSelectedKeyboardLayoutLabelForUser(Context context, @UserIdInt int userId,
|
||||||
|
@@ -72,7 +72,8 @@ public class TouchGesturesButtonPreferenceController extends BasePreferenceContr
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getAvailabilityStatus() {
|
public int getAvailabilityStatus() {
|
||||||
return AVAILABLE;
|
boolean isTouchpad = NewKeyboardSettingsUtils.isTouchpad();
|
||||||
|
return isTouchpad ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void showTouchpadGestureEducation() {
|
private void showTouchpadGestureEducation() {
|
||||||
|
@@ -49,7 +49,8 @@ public class TrackpadBottomPreferenceController extends TogglePreferenceControll
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getAvailabilityStatus() {
|
public int getAvailabilityStatus() {
|
||||||
return AVAILABLE;
|
boolean isTouchpad = NewKeyboardSettingsUtils.isTouchpad();
|
||||||
|
return isTouchpad ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@@ -49,7 +49,8 @@ public class TrackpadReverseScrollingPreferenceController extends TogglePreferen
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getAvailabilityStatus() {
|
public int getAvailabilityStatus() {
|
||||||
return AVAILABLE;
|
boolean isTouchpad = NewKeyboardSettingsUtils.isTouchpad();
|
||||||
|
return isTouchpad ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@@ -84,6 +84,10 @@ public class TrackpadSettingsController extends BasePreferenceController
|
|||||||
boolean isFeatureOn = FeatureFlagUtils
|
boolean isFeatureOn = FeatureFlagUtils
|
||||||
.isEnabled(mContext, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD);
|
.isEnabled(mContext, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD);
|
||||||
boolean isTouchpad = NewKeyboardSettingsUtils.isTouchpad();
|
boolean isTouchpad = NewKeyboardSettingsUtils.isTouchpad();
|
||||||
return (isFeatureOn && isTouchpad) ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
|
boolean isPointerCustomizationEnabled =
|
||||||
|
android.view.flags.Flags.enableVectorCursorA11ySettings();
|
||||||
|
boolean isMouse = NewKeyboardSettingsUtils.isMouse();
|
||||||
|
return (isFeatureOn && isTouchpad) || (isPointerCustomizationEnabled && isMouse) ? AVAILABLE
|
||||||
|
: CONDITIONALLY_UNAVAILABLE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -49,7 +49,8 @@ public class TrackpadTapDraggingPreferenceController extends TogglePreferenceCon
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getAvailabilityStatus() {
|
public int getAvailabilityStatus() {
|
||||||
return InputSettings.isTouchpadTapDraggingFeatureFlagEnabled()
|
boolean isTouchpad = NewKeyboardSettingsUtils.isTouchpad();
|
||||||
|
return (InputSettings.isTouchpadTapDraggingFeatureFlagEnabled() && isTouchpad)
|
||||||
? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
|
? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -49,7 +49,8 @@ public class TrackpadTapToClickPreferenceController extends TogglePreferenceCont
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getAvailabilityStatus() {
|
public int getAvailabilityStatus() {
|
||||||
return AVAILABLE;
|
boolean isTouchpad = NewKeyboardSettingsUtils.isTouchpad();
|
||||||
|
return isTouchpad ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@@ -31,6 +31,7 @@ public class TrackpadTouchGestureSettingsController extends BasePreferenceContro
|
|||||||
public int getAvailabilityStatus() {
|
public int getAvailabilityStatus() {
|
||||||
boolean isFeatureOn = FeatureFlagUtils
|
boolean isFeatureOn = FeatureFlagUtils
|
||||||
.isEnabled(mContext, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE);
|
.isEnabled(mContext, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE);
|
||||||
return isFeatureOn ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
|
boolean isTouchpad = NewKeyboardSettingsUtils.isTouchpad();
|
||||||
|
return (isFeatureOn && isTouchpad) ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -26,12 +26,14 @@ import android.app.settings.SettingsEnums;
|
|||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.os.UserHandle;
|
import android.os.UserHandle;
|
||||||
import android.provider.Settings;
|
import android.provider.Settings;
|
||||||
|
import android.view.InputDevice;
|
||||||
|
|
||||||
import androidx.test.core.app.ApplicationProvider;
|
import androidx.test.core.app.ApplicationProvider;
|
||||||
|
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settings.core.BasePreferenceController;
|
import com.android.settings.core.BasePreferenceController;
|
||||||
import com.android.settings.testutils.FakeFeatureFactory;
|
import com.android.settings.testutils.FakeFeatureFactory;
|
||||||
|
import com.android.settings.testutils.shadow.ShadowInputDevice;
|
||||||
|
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Rule;
|
import org.junit.Rule;
|
||||||
@@ -46,6 +48,7 @@ import org.robolectric.annotation.Config;
|
|||||||
@RunWith(RobolectricTestRunner.class)
|
@RunWith(RobolectricTestRunner.class)
|
||||||
@Config(shadows = {
|
@Config(shadows = {
|
||||||
com.android.settings.testutils.shadow.ShadowSystemSettings.class,
|
com.android.settings.testutils.shadow.ShadowSystemSettings.class,
|
||||||
|
com.android.settings.testutils.shadow.ShadowInputDevice.class,
|
||||||
})
|
})
|
||||||
public class TrackpadBottomPreferenceControllerTest {
|
public class TrackpadBottomPreferenceControllerTest {
|
||||||
@Rule
|
@Rule
|
||||||
@@ -67,6 +70,12 @@ public class TrackpadBottomPreferenceControllerTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void getAvailabilityStatus_expected() {
|
public void getAvailabilityStatus_expected() {
|
||||||
|
int deviceId = 1;
|
||||||
|
ShadowInputDevice.sDeviceIds = new int[]{deviceId};
|
||||||
|
InputDevice device = ShadowInputDevice.makeInputDevicebyIdWithSources(deviceId,
|
||||||
|
InputDevice.SOURCE_TOUCHPAD);
|
||||||
|
ShadowInputDevice.addDevice(deviceId, device);
|
||||||
|
|
||||||
assertThat(mController.getAvailabilityStatus())
|
assertThat(mController.getAvailabilityStatus())
|
||||||
.isEqualTo(BasePreferenceController.AVAILABLE);
|
.isEqualTo(BasePreferenceController.AVAILABLE);
|
||||||
}
|
}
|
||||||
|
@@ -26,12 +26,14 @@ import android.app.settings.SettingsEnums;
|
|||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.os.UserHandle;
|
import android.os.UserHandle;
|
||||||
import android.provider.Settings;
|
import android.provider.Settings;
|
||||||
|
import android.view.InputDevice;
|
||||||
|
|
||||||
import androidx.test.core.app.ApplicationProvider;
|
import androidx.test.core.app.ApplicationProvider;
|
||||||
|
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settings.core.BasePreferenceController;
|
import com.android.settings.core.BasePreferenceController;
|
||||||
import com.android.settings.testutils.FakeFeatureFactory;
|
import com.android.settings.testutils.FakeFeatureFactory;
|
||||||
|
import com.android.settings.testutils.shadow.ShadowInputDevice;
|
||||||
|
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Rule;
|
import org.junit.Rule;
|
||||||
@@ -46,6 +48,7 @@ import org.robolectric.annotation.Config;
|
|||||||
@RunWith(RobolectricTestRunner.class)
|
@RunWith(RobolectricTestRunner.class)
|
||||||
@Config(shadows = {
|
@Config(shadows = {
|
||||||
com.android.settings.testutils.shadow.ShadowSystemSettings.class,
|
com.android.settings.testutils.shadow.ShadowSystemSettings.class,
|
||||||
|
com.android.settings.testutils.shadow.ShadowInputDevice.class,
|
||||||
})
|
})
|
||||||
public class TrackpadReverseScrollingPreferenceControllerTest {
|
public class TrackpadReverseScrollingPreferenceControllerTest {
|
||||||
@Rule
|
@Rule
|
||||||
@@ -67,6 +70,12 @@ public class TrackpadReverseScrollingPreferenceControllerTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void getAvailabilityStatus_expected() {
|
public void getAvailabilityStatus_expected() {
|
||||||
|
int deviceId = 1;
|
||||||
|
ShadowInputDevice.sDeviceIds = new int[]{deviceId};
|
||||||
|
InputDevice device = ShadowInputDevice.makeInputDevicebyIdWithSources(deviceId,
|
||||||
|
InputDevice.SOURCE_TOUCHPAD);
|
||||||
|
ShadowInputDevice.addDevice(deviceId, device);
|
||||||
|
|
||||||
assertThat(mController.getAvailabilityStatus())
|
assertThat(mController.getAvailabilityStatus())
|
||||||
.isEqualTo(BasePreferenceController.AVAILABLE);
|
.isEqualTo(BasePreferenceController.AVAILABLE);
|
||||||
}
|
}
|
||||||
|
@@ -0,0 +1,101 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2024 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.inputmethod;
|
||||||
|
|
||||||
|
import static android.view.flags.Flags.enableVectorCursorA11ySettings;
|
||||||
|
|
||||||
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
|
import static org.junit.Assume.assumeTrue;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.view.InputDevice;
|
||||||
|
|
||||||
|
import androidx.test.core.app.ApplicationProvider;
|
||||||
|
|
||||||
|
import com.android.settings.core.BasePreferenceController;
|
||||||
|
import com.android.settings.testutils.shadow.ShadowInputDevice;
|
||||||
|
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Rule;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.mockito.junit.MockitoJUnit;
|
||||||
|
import org.mockito.junit.MockitoRule;
|
||||||
|
import org.robolectric.RobolectricTestRunner;
|
||||||
|
import org.robolectric.annotation.Config;
|
||||||
|
|
||||||
|
/** Tests for {@link TrackpadSettingsController} */
|
||||||
|
@RunWith(RobolectricTestRunner.class)
|
||||||
|
@Config(shadows = {
|
||||||
|
com.android.settings.testutils.shadow.ShadowSystemSettings.class,
|
||||||
|
ShadowInputDevice.class,
|
||||||
|
})
|
||||||
|
public class TrackpadSettingsControllerTest {
|
||||||
|
@Rule
|
||||||
|
public MockitoRule rule = MockitoJUnit.rule();
|
||||||
|
|
||||||
|
private static final String PREFERENCE_KEY = "trackpad_settings";
|
||||||
|
|
||||||
|
private Context mContext;
|
||||||
|
private TrackpadSettingsController mController;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setUp() {
|
||||||
|
mContext = ApplicationProvider.getApplicationContext();
|
||||||
|
mController = new TrackpadSettingsController(mContext, PREFERENCE_KEY);
|
||||||
|
ShadowInputDevice.reset();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getAvailabilityStatus_isTouchpadAvailable() {
|
||||||
|
int deviceId = 1;
|
||||||
|
ShadowInputDevice.sDeviceIds = new int[]{deviceId};
|
||||||
|
InputDevice device = ShadowInputDevice.makeInputDevicebyIdWithSources(deviceId,
|
||||||
|
InputDevice.SOURCE_TOUCHPAD);
|
||||||
|
ShadowInputDevice.addDevice(deviceId, device);
|
||||||
|
|
||||||
|
assertThat(mController.getAvailabilityStatus())
|
||||||
|
.isEqualTo(BasePreferenceController.AVAILABLE);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getAvailabilityStatus_isMouseAvailable() {
|
||||||
|
assumeTrue(enableVectorCursorA11ySettings());
|
||||||
|
|
||||||
|
int deviceId = 1;
|
||||||
|
ShadowInputDevice.sDeviceIds = new int[]{deviceId};
|
||||||
|
InputDevice device = ShadowInputDevice.makeInputDevicebyIdWithSources(deviceId,
|
||||||
|
InputDevice.SOURCE_MOUSE);
|
||||||
|
ShadowInputDevice.addDevice(deviceId, device);
|
||||||
|
|
||||||
|
assertThat(mController.getAvailabilityStatus())
|
||||||
|
.isEqualTo(BasePreferenceController.AVAILABLE);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getAvailabilityStatus_noMouseOrTouchpadUnavailable() {
|
||||||
|
int deviceId = 1;
|
||||||
|
ShadowInputDevice.sDeviceIds = new int[]{deviceId};
|
||||||
|
InputDevice device = ShadowInputDevice.makeInputDevicebyIdWithSources(deviceId,
|
||||||
|
InputDevice.SOURCE_UNKNOWN);
|
||||||
|
ShadowInputDevice.addDevice(deviceId, device);
|
||||||
|
|
||||||
|
assertThat(mController.getAvailabilityStatus())
|
||||||
|
.isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
|
||||||
|
}
|
||||||
|
}
|
@@ -26,12 +26,14 @@ import android.app.settings.SettingsEnums;
|
|||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.os.UserHandle;
|
import android.os.UserHandle;
|
||||||
import android.provider.Settings;
|
import android.provider.Settings;
|
||||||
|
import android.view.InputDevice;
|
||||||
|
|
||||||
import androidx.test.core.app.ApplicationProvider;
|
import androidx.test.core.app.ApplicationProvider;
|
||||||
|
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settings.core.BasePreferenceController;
|
import com.android.settings.core.BasePreferenceController;
|
||||||
import com.android.settings.testutils.FakeFeatureFactory;
|
import com.android.settings.testutils.FakeFeatureFactory;
|
||||||
|
import com.android.settings.testutils.shadow.ShadowInputDevice;
|
||||||
|
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Rule;
|
import org.junit.Rule;
|
||||||
@@ -46,6 +48,7 @@ import org.robolectric.annotation.Config;
|
|||||||
@RunWith(RobolectricTestRunner.class)
|
@RunWith(RobolectricTestRunner.class)
|
||||||
@Config(shadows = {
|
@Config(shadows = {
|
||||||
com.android.settings.testutils.shadow.ShadowSystemSettings.class,
|
com.android.settings.testutils.shadow.ShadowSystemSettings.class,
|
||||||
|
com.android.settings.testutils.shadow.ShadowInputDevice.class,
|
||||||
})
|
})
|
||||||
public class TrackpadTapToClickPreferenceControllerTest {
|
public class TrackpadTapToClickPreferenceControllerTest {
|
||||||
@Rule
|
@Rule
|
||||||
@@ -67,6 +70,12 @@ public class TrackpadTapToClickPreferenceControllerTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void getAvailabilityStatus_expected() {
|
public void getAvailabilityStatus_expected() {
|
||||||
|
int deviceId = 1;
|
||||||
|
ShadowInputDevice.sDeviceIds = new int[]{deviceId};
|
||||||
|
InputDevice device = ShadowInputDevice.makeInputDevicebyIdWithSources(deviceId,
|
||||||
|
InputDevice.SOURCE_TOUCHPAD);
|
||||||
|
ShadowInputDevice.addDevice(deviceId, device);
|
||||||
|
|
||||||
assertThat(mController.getAvailabilityStatus())
|
assertThat(mController.getAvailabilityStatus())
|
||||||
.isEqualTo(BasePreferenceController.AVAILABLE);
|
.isEqualTo(BasePreferenceController.AVAILABLE);
|
||||||
}
|
}
|
||||||
|
@@ -35,6 +35,8 @@ public class ShadowInputDevice extends org.robolectric.shadows.ShadowInputDevice
|
|||||||
|
|
||||||
private int mDeviceId;
|
private int mDeviceId;
|
||||||
|
|
||||||
|
private int mSources;
|
||||||
|
|
||||||
@Implementation
|
@Implementation
|
||||||
protected static int[] getDeviceIds() {
|
protected static int[] getDeviceIds() {
|
||||||
return sDeviceIds;
|
return sDeviceIds;
|
||||||
@@ -70,4 +72,21 @@ public class ShadowInputDevice extends org.robolectric.shadows.ShadowInputDevice
|
|||||||
public void setId(int id) {
|
public void setId(int id) {
|
||||||
mDeviceId = id;
|
mDeviceId = id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static InputDevice makeInputDevicebyIdWithSources(int id, int sources) {
|
||||||
|
final InputDevice inputDevice = Shadow.newInstanceOf(InputDevice.class);
|
||||||
|
final ShadowInputDevice shadowInputDevice = Shadow.extract(inputDevice);
|
||||||
|
shadowInputDevice.setId(id);
|
||||||
|
shadowInputDevice.setSources(sources);
|
||||||
|
return inputDevice;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Implementation
|
||||||
|
public int getSources() {
|
||||||
|
return mSources;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSources(int sources) {
|
||||||
|
mSources = sources;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user