Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8c8c537 authored by Pat Manning's avatar Pat Manning Committed by Android (Google) Code Review
Browse files

Merge "Update Touchpad settings page to include mouse." into main

parents 2db5d161 1257610b

res/xml/system_dashboard_fragment.xml

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 


    <Preference

        android:key="trackpad_settings"

        android:title="@string/trackpad_settings"

        android:title="@string/trackpad_mouse_settings"

        android:summary="@string/trackpad_settings_summary"

        android:icon="@drawable/ic_settings_trackpad"

        android:order="-254"

res/xml/trackpad_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:title="@string/trackpad_settings">

    android:title="@string/trackpad_mouse_settings">

    <Preference

        android:key="trackpad_gesture_settings"

        android:title="@string/trackpad_touchpad_gesture_title"

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

+14 −0
Original line number Diff line number Diff line
@@ -66,6 +66,20 @@ public class NewKeyboardSettingsUtils { 
        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")

    @Nullable

    static String getSelectedKeyboardLayoutLabelForUser(Context context, @UserIdInt int userId,

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

+2 −1
Original line number Diff line number Diff line
@@ -72,7 +72,8 @@ public class TouchGesturesButtonPreferenceController extends BasePreferenceContr 


    @Override

    public int getAvailabilityStatus() {

        return AVAILABLE;

        boolean isTouchpad = NewKeyboardSettingsUtils.isTouchpad();

        return isTouchpad ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;

    }



    private void showTouchpadGestureEducation() {

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

+2 −1
Original line number Diff line number Diff line
@@ -49,7 +49,8 @@ public class TrackpadBottomPreferenceController extends TogglePreferenceControll 


    @Override

    public int getAvailabilityStatus() {

        return AVAILABLE;

        boolean isTouchpad = NewKeyboardSettingsUtils.isTouchpad();

        return isTouchpad ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;

    }



    @Override