Touchpad: replace references to "trackpad" with "touchpad"

When we first added the touchpad settings we hadn't settled on whether
to refer to them as "touchpads" or "trackpads" yet. We've since settled
on "touchpad", but that's left us with some Settings code referring to
one and some to the other. Let's standardize on "touchpad" since that's
consistent with user-facing strings and the rest of the input codebase.

This CL doesn't change string identifiers, as I believe that would cause
them to get different Translation Console IDs and thus be retranslated.

Bug: 245989146
Test: m
Test: check strings and icons are still displayed correctly in the
      touchpad settings and tutorial, and that settings toggles and the
      tutorial still work
Test: atest SettingsRoboTests
Flag: EXEMPT refactor
Change-Id: I930e9fc85e09e03da3513e5f8443077fa8ea91b0

res/layout/touchpad_gesture_preview.xml

@@ -17,7 +17,7 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
-    android:background="@drawable/trackpad_gesture_dialog_bg"
+    android:background="@drawable/touchpad_gesture_dialog_bg"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
@@ -46,7 +46,7 @@
             android:layout_alignParentStart="true"
             android:paddingVertical="14dp"
             android:drawablePadding="9dp"
-            style="@style/TrackpadButtonCancel"
+            style="@style/TouchpadButtonCancel"
             android:textColor="?android:attr/textColorPrimary"
             android:text="@string/gesture_button_skip"/>
 
@@ -60,7 +60,7 @@
             android:layout_alignParentStart="true"
             android:paddingVertical="14dp"
             android:drawablePadding="9dp"
-            style="@style/TrackpadButtonCancel"
+            style="@style/TouchpadButtonCancel"
             android:textColor="?android:attr/textColorPrimary"
             android:text="@string/gesture_button_restart"/>
 
@@ -81,7 +81,7 @@
             android:layout_alignParentEnd="true"
             android:paddingVertical="14dp"
             android:drawablePadding="9dp"
-            style="@style/TrackpadButtonDone"
+            style="@style/TouchpadButtonDone"
             android:textColor="@androidprv:color/materialColorOnPrimary"
             android:text="@string/gesture_button_next"/>
 
@@ -95,7 +95,7 @@
             android:layout_alignParentEnd="true"
             android:paddingVertical="14dp"
             android:drawablePadding="9dp"
-            style="@style/TrackpadButtonDone"
+            style="@style/TouchpadButtonDone"
             android:textColor="@androidprv:color/materialColorOnPrimary"
             android:text="@string/gesture_button_done"/>
     </RelativeLayout>

res/values/styles.xml

@@ -372,15 +372,15 @@
         <item name="android:padding">4dp</item>
     </style>
 
-    <style name="TrackpadButtonDone" parent="@android:style/Widget.Material.Button">
+    <style name="TouchpadButtonDone" parent="@android:style/Widget.Material.Button">
-        <item name="android:background">@drawable/trackpad_button_done_colored</item>
+        <item name="android:background">@drawable/touchpad_button_done_colored</item>
         <item name="android:stateListAnimator">@null</item>
         <item name="android:textSize">16sp</item>
         <item name="android:padding">4dp</item>
     </style>
 
-    <style name="TrackpadButtonCancel" parent="@android:style/Widget.Material.Button">
+    <style name="TouchpadButtonCancel" parent="@android:style/Widget.Material.Button">
-        <item name="android:background">@drawable/trackpad_bordered</item>
+        <item name="android:background">@drawable/touchpad_bordered</item>
         <item name="android:stateListAnimator">@null</item>
         <item name="android:textSize">16sp</item>
         <item name="android:padding">4dp</item>

res/xml/system_dashboard_fragment.xml

@@ -50,7 +50,7 @@
         android:key="trackpad_settings"
         android:title="@string/trackpad_mouse_settings"
         android:summary="@string/trackpad_settings_summary"
-        android:icon="@drawable/ic_settings_trackpad"
+        android:icon="@drawable/ic_settings_touchpad"
         android:order="-254"
         android:fragment="com.android.settings.inputmethod.TouchpadAndMouseSettings"
         settings:controller="com.android.settings.inputmethod.TouchpadAndMouseSettingsController"/>
@@ -59,7 +59,7 @@
         android:key="touchpad_settings"
         android:title="@string/trackpad_settings"
         android:summary="@string/trackpad_settings_summary"
-        android:icon="@drawable/ic_settings_trackpad"
+        android:icon="@drawable/ic_settings_touchpad"
         android:order="-253"
         android:fragment="com.android.settings.inputmethod.TouchpadSettingFragment"
         settings:controller="com.android.settings.inputmethod.TouchpadSettingsController"/>

res/xml/touchpad_and_mouse_settings.xml

@@ -20,31 +20,31 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/trackpad_mouse_settings">
     <SwitchPreferenceCompat
-        android:key="trackpad_tap_to_click"
+        android:key="touchpad_tap_to_click"
         android:title="@string/trackpad_tap_to_click"
-        settings:controller="com.android.settings.inputmethod.TrackpadTapToClickPreferenceController"
+        settings:controller="com.android.settings.inputmethod.TouchpadTapToClickPreferenceController"
         android:order="10"/>
 
     <SwitchPreferenceCompat
-        android:key="trackpad_reverse_scrolling"
+        android:key="touchpad_reverse_scrolling"
         android:title="@string/trackpad_reverse_scrolling_title"
         android:summary="@string/trackpad_reverse_scrolling_summary"
-        settings:controller="com.android.settings.inputmethod.TrackpadReverseScrollingPreferenceController"
+        settings:controller="com.android.settings.inputmethod.TouchpadReverseScrollingPreferenceController"
         android:order="20"/>
 
     <SwitchPreferenceCompat
-        android:key="trackpad_bottom_right_tap"
+        android:key="touchpad_bottom_right_tap"
         android:title="@string/trackpad_bottom_right_tap_title"
         android:summary="@string/trackpad_bottom_right_tap_summary"
-        settings:controller="com.android.settings.inputmethod.TrackpadBottomPreferenceController"
+        settings:controller="com.android.settings.inputmethod.TouchpadRightClickZonePreferenceController"
         android:order="30"
         settings:keywords="@string/keywords_trackpad_bottom_right_tap"/>
 
     <SwitchPreferenceCompat
-        android:key="trackpad_tap_dragging"
+        android:key="touchpad_tap_dragging"
         android:title="@string/trackpad_tap_dragging_title"
         android:summary="@string/trackpad_tap_dragging_summary"
-        settings:controller="com.android.settings.inputmethod.TrackpadTapDraggingPreferenceController"
+        settings:controller="com.android.settings.inputmethod.TouchpadTapDraggingPreferenceController"
         android:order="35"/>
 
     <Preference
@@ -55,11 +55,11 @@
         android:order="37"/>
 
     <com.android.settings.widget.SeekBarPreference
-        android:key="trackpad_pointer_speed"
+        android:key="touchpad_pointer_speed"
         android:title="@string/trackpad_pointer_speed"
         android:order="40"
         android:selectable="false"
-        settings:controller="com.android.settings.inputmethod.TrackpadPointerSpeedPreferenceController"/>
+        settings:controller="com.android.settings.inputmethod.TouchpadPointerSpeedPreferenceController"/>
 
     <SwitchPreferenceCompat
         android:key="mouse_reverse_vertical_scrolling"
@@ -91,13 +91,13 @@
         settings:searchable="true"/>
 
     <com.android.settingslib.widget.ButtonPreference
-        android:key="trackpad_touch_gesture"
+        android:key="touchpad_touch_gesture"
         android:title="@string/trackpad_touch_gesture"
-        settings:controller="com.android.settings.inputmethod.TouchGesturesButtonPreferenceController"/>
+        settings:controller="com.android.settings.inputmethod.TouchpadGesturesTutorialButtonPreferenceController"/>
 
     <com.android.settingslib.widget.FooterPreference
-        android:key="trackpad_gestures_disabled_footer"
+        android:key="touchpad_gestures_disabled_footer"
         android:title="@string/trackpad_gestures_disabled_footer_text"
         settings:searchable="false"
-        settings:controller="com.android.settings.inputmethod.TrackpadGesturesDisabledFooterPreferenceController"/>
+        settings:controller="com.android.settings.inputmethod.TouchpadGesturesDisabledFooterPreferenceController"/>
 </PreferenceScreen>

res/xml/touchpad_settings.xml

@@ -20,31 +20,31 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/trackpad_settings">
     <SwitchPreferenceCompat
-        android:key="trackpad_tap_to_click"
+        android:key="touchpad_tap_to_click"
         android:title="@string/trackpad_tap_to_click"
-        settings:controller="com.android.settings.inputmethod.TrackpadTapToClickPreferenceController"
+        settings:controller="com.android.settings.inputmethod.TouchpadTapToClickPreferenceController"
         android:order="10"/>
 
     <SwitchPreferenceCompat
-        android:key="trackpad_reverse_scrolling"
+        android:key="touchpad_reverse_scrolling"
         android:title="@string/trackpad_reverse_scrolling_title"
         android:summary="@string/trackpad_reverse_scrolling_summary"
-        settings:controller="com.android.settings.inputmethod.TrackpadReverseScrollingPreferenceController"
+        settings:controller="com.android.settings.inputmethod.TouchpadReverseScrollingPreferenceController"
         android:order="20"/>
 
     <SwitchPreferenceCompat
-        android:key="trackpad_bottom_right_tap"
+        android:key="touchpad_bottom_right_tap"
         android:title="@string/trackpad_bottom_right_tap_title"
         android:summary="@string/trackpad_bottom_right_tap_summary"
-        settings:controller="com.android.settings.inputmethod.TrackpadBottomPreferenceController"
+        settings:controller="com.android.settings.inputmethod.TouchpadRightClickZonePreferenceController"
         android:order="30"
         settings:keywords="@string/keywords_trackpad_bottom_right_tap"/>
 
     <SwitchPreferenceCompat
-        android:key="trackpad_tap_dragging"
+        android:key="touchpad_tap_dragging"
         android:title="@string/trackpad_tap_dragging_title"
         android:summary="@string/trackpad_tap_dragging_summary"
-        settings:controller="com.android.settings.inputmethod.TrackpadTapDraggingPreferenceController"
+        settings:controller="com.android.settings.inputmethod.TouchpadTapDraggingPreferenceController"
         android:order="35"/>
 
     <Preference
@@ -55,11 +55,11 @@
         android:order="37"/>
 
     <com.android.settings.widget.SeekBarPreference
-        android:key="trackpad_pointer_speed"
+        android:key="touchpad_pointer_speed"
         android:title="@string/trackpad_pointer_speed"
         android:order="40"
         android:selectable="false"
-        settings:controller="com.android.settings.inputmethod.TrackpadPointerSpeedPreferenceController"/>
+        settings:controller="com.android.settings.inputmethod.TouchpadPointerSpeedPreferenceController"/>
 
     <Preference
         android:fragment="com.android.settings.inputmethod.PointerTouchpadFragment"
@@ -71,13 +71,13 @@
         settings:searchable="true"/>
 
     <com.android.settingslib.widget.ButtonPreference
-        android:key="trackpad_touch_gesture"
+        android:key="touchpad_touch_gesture"
         android:title="@string/trackpad_touch_gesture"
-        settings:controller="com.android.settings.inputmethod.TouchGesturesButtonPreferenceController"/>
+        settings:controller="com.android.settings.inputmethod.TouchpadGesturesTutorialButtonPreferenceController"/>
 
     <com.android.settingslib.widget.FooterPreference
         android:key="trackpad_gestures_disabled_footer"
         android:title="@string/trackpad_gestures_disabled_footer_text"
         settings:searchable="false"
-        settings:controller="com.android.settings.inputmethod.TrackpadGesturesDisabledFooterPreferenceController"/>
+        settings:controller="com.android.settings.inputmethod.TouchpadGesturesDisabledFooterPreferenceController"/>
 </PreferenceScreen>

src/com/android/settings/inputmethod/TouchpadAndMouseSettings.java

@@ -36,7 +36,7 @@ public class TouchpadAndMouseSettings extends DashboardFragment {
     @Override
     public void onAttach(@NonNull Context context) {
         super.onAttach(context);
-        use(TouchGesturesButtonPreferenceController.class).setFragment(this /*parent*/);
+        use(TouchpadGesturesTutorialButtonPreferenceController.class).setFragment(this /*parent*/);
     }
 
     @Override

src/com/android/settings/inputmethod/TouchpadGestureDialogFragment.java

@@ -48,7 +48,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 import java.util.ArrayList;
 import java.util.Arrays;
 
-public class TrackpadGestureDialogFragment extends BottomSheetDialogFragment {
+public class TouchpadGestureDialogFragment extends BottomSheetDialogFragment {
 
     private Context mContext;
     private LayoutInflater mInflater;
@@ -67,8 +67,6 @@ public class TrackpadGestureDialogFragment extends BottomSheetDialogFragment {
     private static final int DOT_INDICATOR_LEFT_PADDING = 6;
     private static final int DOT_INDICATOR_RIGHT_PADDING = 6;
 
-    public TrackpadGestureDialogFragment() {}
-
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
@@ -118,7 +116,7 @@ public class TrackpadGestureDialogFragment extends BottomSheetDialogFragment {
         Dialog dialog = super.onCreateDialog(savedInstanceState);
 
         mInflater = mContext.getSystemService(LayoutInflater.class);
-        View contentView = mInflater.inflate(R.layout.trackpad_gesture_preview, null);
+        View contentView = mInflater.inflate(R.layout.touchpad_gesture_preview, null);
         addViewPager(contentView);
         dialog.setContentView(contentView);
         Window gestureDialogWindow = dialog.getWindow();

src/com/android/settings/inputmethod/TouchpadGesturesDisabledFooterPreferenceController.java

@@ -21,9 +21,9 @@ import android.hardware.input.InputSettings;
 
 import com.android.settings.core.BasePreferenceController;
 
-public class TrackpadGesturesDisabledFooterPreferenceController extends BasePreferenceController {
+public class TouchpadGesturesDisabledFooterPreferenceController extends BasePreferenceController {
 
-    public TrackpadGesturesDisabledFooterPreferenceController(Context context, String key) {
+    public TouchpadGesturesDisabledFooterPreferenceController(Context context, String key) {
         super(context, key);
     }
 

src/com/android/settings/inputmethod/TouchpadGesturesTutorialButtonPreferenceController.java

@@ -33,17 +33,17 @@ import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.widget.ButtonPreference;
 
-public class TouchGesturesButtonPreferenceController extends BasePreferenceController {
+public class TouchpadGesturesTutorialButtonPreferenceController extends BasePreferenceController {
 
     private static final int ORDER_BOTTOM = 100;
-    private static final String PREFERENCE_KEY = "trackpad_touch_gesture";
+    private static final String PREFERENCE_KEY = "touchpad_touch_gesture";
     private static final String GESTURE_DIALOG_TAG = "GESTURE_DIALOG_TAG";
     private static final String TUTORIAL_ACTION = "com.android.systemui.action.TOUCHPAD_TUTORIAL";
 
     private Fragment mParent;
     private MetricsFeatureProvider mMetricsFeatureProvider;
 
-    public TouchGesturesButtonPreferenceController(Context context, String key) {
+    public TouchpadGesturesTutorialButtonPreferenceController(Context context, String key) {
         super(context, key);
         mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
     }
@@ -88,7 +88,7 @@ public class TouchGesturesButtonPreferenceController extends BasePreferenceContr
             // of user 0 sysui instance
             mContext.startActivityAsUser(intent, UserHandle.SYSTEM);
         } else {
-            TrackpadGestureDialogFragment fragment = new TrackpadGestureDialogFragment();
+            TouchpadGestureDialogFragment fragment = new TouchpadGestureDialogFragment();
             fragment.setTargetFragment(mParent, 0);
             fragment.show(mParent.getActivity().getSupportFragmentManager(), GESTURE_DIALOG_TAG);
         }

src/com/android/settings/inputmethod/TouchpadPointerSpeedPreferenceController.java

@@ -27,12 +27,12 @@ import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.widget.SeekBarPreference;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
-public class TrackpadPointerSpeedPreferenceController extends SliderPreferenceController {
+public class TouchpadPointerSpeedPreferenceController extends SliderPreferenceController {
 
     private SeekBarPreference mPreference;
     private MetricsFeatureProvider mMetricsFeatureProvider;
 
-    public TrackpadPointerSpeedPreferenceController(Context context, String key) {
+    public TouchpadPointerSpeedPreferenceController(Context context, String key) {
         super(context, key);
         mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
     }

src/com/android/settings/inputmethod/TouchpadReverseScrollingPreferenceController.java

@@ -25,11 +25,11 @@ import com.android.settings.core.TogglePreferenceController;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
-public class TrackpadReverseScrollingPreferenceController extends TogglePreferenceController {
+public class TouchpadReverseScrollingPreferenceController extends TogglePreferenceController {
 
     private MetricsFeatureProvider mMetricsFeatureProvider;
 
-    public TrackpadReverseScrollingPreferenceController(Context context, String key) {
+    public TouchpadReverseScrollingPreferenceController(Context context, String key) {
         super(context, key);
         mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
     }

src/com/android/settings/inputmethod/TouchpadRightClickZonePreferenceController.java

@@ -25,11 +25,11 @@ import com.android.settings.core.TogglePreferenceController;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
-public class TrackpadBottomPreferenceController extends TogglePreferenceController {
+public class TouchpadRightClickZonePreferenceController extends TogglePreferenceController {
 
     private MetricsFeatureProvider mMetricsFeatureProvider;
 
-    public TrackpadBottomPreferenceController(Context context, String key) {
+    public TouchpadRightClickZonePreferenceController(Context context, String key) {
         super(context, key);
         mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
     }

src/com/android/settings/inputmethod/TouchpadTapDraggingPreferenceController.java

@@ -25,11 +25,11 @@ import com.android.settings.core.TogglePreferenceController;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
-public class TrackpadTapDraggingPreferenceController extends TogglePreferenceController {
+public class TouchpadTapDraggingPreferenceController extends TogglePreferenceController {
 
     private MetricsFeatureProvider mMetricsFeatureProvider;
 
-    public TrackpadTapDraggingPreferenceController(Context context, String key) {
+    public TouchpadTapDraggingPreferenceController(Context context, String key) {
         super(context, key);
         mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
     }

src/com/android/settings/inputmethod/TouchpadTapToClickPreferenceController.java

@@ -25,11 +25,11 @@ import com.android.settings.core.TogglePreferenceController;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
-public class TrackpadTapToClickPreferenceController extends TogglePreferenceController {
+public class TouchpadTapToClickPreferenceController extends TogglePreferenceController {
 
     private MetricsFeatureProvider mMetricsFeatureProvider;
 
-    public TrackpadTapToClickPreferenceController(Context context, String key) {
+    public TouchpadTapToClickPreferenceController(Context context, String key) {
         super(context, key);
         mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
     }

tests/robotests/src/com/android/settings/inputmethod/TouchpadPointerSpeedPreferenceControllerTest.java

@@ -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,

tests/robotests/src/com/android/settings/inputmethod/TouchpadReverseScrollingPreferenceControllerTest.java

@@ -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

tests/robotests/src/com/android/settings/inputmethod/TouchpadRightClickZonePreferenceControllerTest.java

@@ -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

tests/robotests/src/com/android/settings/inputmethod/TouchpadTapToClickPreferenceControllerTest.java

@@ -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