PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Touchpad: replace references to "trackpad" with "touchpad"" into main

Browse Source
This commit is contained in:
Harry Cutts
2025-01-08 07:39:51 -08:00
committed by Android (Google) Code Review
parent e28dcd02bc 509fd17515
commit cc30711d59
22 changed files with 77 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/robotests/src/com/android/settings/inputmethod/TrackpadPointerSpeedPreferenceControllerTest.java → tests/robotests/src/com/android/settings/inputmethod/TouchpadPointerSpeedPreferenceControllerTest.java
View File

@@ -42,20 +42,20 @@ import org.mockito.junit.MockitoRule;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
/** Tests for {@link TrackpadPointerSpeedPreferenceController} */
/** Tests for {@link TouchpadPointerSpeedPreferenceController} */
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {
com.android.settings.testutils.shadow.ShadowSystemSettings.class,
})
public class TrackpadPointerSpeedPreferenceControllerTest {
public class TouchpadPointerSpeedPreferenceControllerTest {
@Rule
public MockitoRule rule = MockitoJUnit.rule();
private static final String PREFERENCE_KEY = "trackpad_pointer_speed";
private static final String PREFERENCE_KEY = "touchpad_pointer_speed";
private static final String SETTING_KEY = Settings.System.TOUCHPAD_POINTER_SPEED;
private Context mContext;
private TrackpadPointerSpeedPreferenceController mController;
private TouchpadPointerSpeedPreferenceController mController;
private int mDefaultSpeed;
private FakeFeatureFactory mFeatureFactory;
@@ -63,7 +63,7 @@ public class TrackpadPointerSpeedPreferenceControllerTest {
public void setUp() {
mContext = ApplicationProvider.getApplicationContext();
mFeatureFactory = FakeFeatureFactory.setupForTest();
mController = new TrackpadPointerSpeedPreferenceController(mContext, PREFERENCE_KEY);
mController = new TouchpadPointerSpeedPreferenceController(mContext, PREFERENCE_KEY);
mDefaultSpeed = Settings.System.getIntForUser(
mContext.getContentResolver(),
SETTING_KEY,

10
tests/robotests/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceControllerTest.java → tests/robotests/src/com/android/settings/inputmethod/TouchpadReverseScrollingPreferenceControllerTest.java
View File

@@ -44,28 +44,28 @@ import org.mockito.junit.MockitoRule;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
/** Tests for {@link TrackpadReverseScrollingPreferenceController} */
/** Tests for {@link TouchpadReverseScrollingPreferenceController} */
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {
com.android.settings.testutils.shadow.ShadowSystemSettings.class,
com.android.settings.testutils.shadow.ShadowInputDevice.class,
})
public class TrackpadReverseScrollingPreferenceControllerTest {
public class TouchpadReverseScrollingPreferenceControllerTest {
@Rule
public MockitoRule rule = MockitoJUnit.rule();
private static final String PREFERENCE_KEY = "trackpad_reverse_scrolling";
private static final String PREFERENCE_KEY = "touchpad_reverse_scrolling";
private static final String SETTING_KEY = Settings.System.TOUCHPAD_NATURAL_SCROLLING;
private Context mContext;
private TrackpadReverseScrollingPreferenceController mController;
private TouchpadReverseScrollingPreferenceController mController;
private FakeFeatureFactory mFeatureFactory;
@Before
public void setUp() {
mContext = ApplicationProvider.getApplicationContext();
mFeatureFactory = FakeFeatureFactory.setupForTest();
mController = new TrackpadReverseScrollingPreferenceController(mContext, PREFERENCE_KEY);
mController = new TouchpadReverseScrollingPreferenceController(mContext, PREFERENCE_KEY);
}
@Test

10
tests/robotests/src/com/android/settings/inputmethod/TrackpadBottomPreferenceControllerTest.java → tests/robotests/src/com/android/settings/inputmethod/TouchpadRightClickZonePreferenceControllerTest.java
View File

@@ -44,28 +44,28 @@ import org.mockito.junit.MockitoRule;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
/** Tests for {@link TrackpadBottomPreferenceController} */
/** Tests for {@link TouchpadRightClickZonePreferenceController} */
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {
com.android.settings.testutils.shadow.ShadowSystemSettings.class,
com.android.settings.testutils.shadow.ShadowInputDevice.class,
})
public class TrackpadBottomPreferenceControllerTest {
public class TouchpadRightClickZonePreferenceControllerTest {
@Rule
public MockitoRule rule = MockitoJUnit.rule();
private static final String PREFERENCE_KEY = "trackpad_bottom_right_tap";
private static final String PREFERENCE_KEY = "touchpad_bottom_right_tap";
private static final String SETTING_KEY = Settings.System.TOUCHPAD_RIGHT_CLICK_ZONE;
private Context mContext;
private TrackpadBottomPreferenceController mController;
private TouchpadRightClickZonePreferenceController mController;
private FakeFeatureFactory mFeatureFactory;
@Before
public void setUp() {
mContext = ApplicationProvider.getApplicationContext();
mFeatureFactory = FakeFeatureFactory.setupForTest();
mController = new TrackpadBottomPreferenceController(mContext, PREFERENCE_KEY);
mController = new TouchpadRightClickZonePreferenceController(mContext, PREFERENCE_KEY);
}
@Test

10
tests/robotests/src/com/android/settings/inputmethod/TrackpadTapToClickPreferenceControllerTest.java → tests/robotests/src/com/android/settings/inputmethod/TouchpadTapToClickPreferenceControllerTest.java
View File

@@ -44,28 +44,28 @@ import org.mockito.junit.MockitoRule;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
/** Tests for {@link TrackpadTapToClickPreferenceController} */
/** Tests for {@link TouchpadTapToClickPreferenceController} */
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {
com.android.settings.testutils.shadow.ShadowSystemSettings.class,
com.android.settings.testutils.shadow.ShadowInputDevice.class,
})
public class TrackpadTapToClickPreferenceControllerTest {
public class TouchpadTapToClickPreferenceControllerTest {
@Rule
public MockitoRule rule = MockitoJUnit.rule();
private static final String PREFERENCE_KEY = "trackpad_tap_to_click";
private static final String PREFERENCE_KEY = "touchpad_tap_to_click";
private static final String SETTING_KEY = Settings.System.TOUCHPAD_TAP_TO_CLICK;
private Context mContext;
private TrackpadTapToClickPreferenceController mController;
private TouchpadTapToClickPreferenceController mController;
private FakeFeatureFactory mFeatureFactory;
@Before
public void setUp() {
mContext = ApplicationProvider.getApplicationContext();
mFeatureFactory = FakeFeatureFactory.setupForTest();
mController = new TrackpadTapToClickPreferenceController(mContext, PREFERENCE_KEY);
mController = new TouchpadTapToClickPreferenceController(mContext, PREFERENCE_KEY);
}
@Test