Merge "[Touchpad & Mouse] Update title based on conditions" into main

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

@@ -36,6 +36,8 @@ import android.view.inputmethod.InputMethodInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.view.inputmethod.InputMethodSubtype;
 
+import androidx.annotation.StringRes;
+
 import com.android.settings.R;
 
 import java.util.Arrays;
@@ -80,6 +82,18 @@ public class NewKeyboardSettingsUtils {
         return false;
     }
 
+    static @StringRes int getTouchpadAndMouseTitleTitleResId() {
+        boolean isMouse = isMouse();
+        boolean isTouchpad = isTouchpad();
+        if (isMouse && isTouchpad) {
+            return R.string.trackpad_mouse_settings;
+        } else if (isMouse) {
+            return R.string.mouse_settings;
+        } else {
+            return R.string.trackpad_settings;
+        }
+    }
+
     @SuppressLint("MissingPermission")
     @Nullable
     static String getSelectedKeyboardLayoutLabelForUser(Context context, @UserIdInt int userId,

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

@@ -18,8 +18,11 @@ package com.android.settings.inputmethod;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
+import android.os.Bundle;
 import android.util.FeatureFlagUtils;
 
+import androidx.annotation.NonNull;
+
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -31,11 +34,18 @@ public class TrackpadSettings extends DashboardFragment {
     private static final String TAG = "TrackpadSettings";
 
     @Override
-    public void onAttach(Context context) {
+    public void onAttach(@NonNull Context context) {
         super.onAttach(context);
         use(TouchGesturesButtonPreferenceController.class).setFragment(this /*parent*/);
     }
 
+    @Override
+    public void onCreate(@NonNull Bundle icicle) {
+        super.onCreate(icicle);
+        getPreferenceScreen().setTitle(
+                NewKeyboardSettingsUtils.getTouchpadAndMouseTitleTitleResId());
+    }
+
     @Override
     public int getMetricsCategory() {
         return SettingsEnums.SETTINGS_KEYBOARDS_TOUCHPAD;

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

@@ -77,6 +77,7 @@ public class TrackpadSettingsController extends BasePreferenceController
             return;
         }
         mPreference.setVisible(isAvailable());
+        mPreference.setTitle(NewKeyboardSettingsUtils.getTouchpadAndMouseTitleTitleResId());
     }
 
     @Override