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

Commit 2be5ef94 authored by shaoweishen's avatar shaoweishen Committed by Shaowei Shen
Browse files

[Physical Keybaord] Add keyboard touchpad/Mouse page - part1 

1. rename TrackpadSetting to TouchpadAndMouseSetting
to match more about usage.

2. Add separated pages for touchpad and mouse.
Gather options from current page and put it accordingly.
Please note that this change only add isolate files for pages
and didn't reference from anywhere, it will be done in next change.

This is part of feature for keyboard setting update.
document: go/new-a11y-touchpad-mouse-page

Bug: 377602364
Test: atest SettingsRoboTests
Flag: com.android.settings.keyboard.keyboard_and_touchpad_a11y_new_page_enabled
Change-Id: I9e18ce3fbc3617bfb6cef3c272f3cfcfd2ff8a37
parent 50bbcbbc

res/xml/mouse_settings.xml

0 → 100644
+34 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  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.

-->



<PreferenceScreen

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

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

    android:title="@string/mouse_settings">



    <SwitchPreferenceCompat

        android:key="mouse_reverse_vertical_scrolling"

        android:title="@string/mouse_reverse_vertical_scrolling"

        android:summary="@string/mouse_reverse_vertical_scrolling_summary"

        settings:controller="com.android.settings.inputmethod.MouseReverseVerticalScrollingPreferenceController" />



    <SwitchPreferenceCompat

        android:key="mouse_swap_primary_button"

        android:title="@string/mouse_swap_primary_button"

        android:summary="@string/mouse_swap_primary_button_summary"

        settings:controller="com.android.settings.inputmethod.MouseSwapPrimaryButtonPreferenceController" />

</PreferenceScreen>

res/xml/system_dashboard_fragment.xml

+2 −2
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ 
        android:summary="@string/trackpad_settings_summary"

        android:icon="@drawable/ic_settings_trackpad"

        android:order="-254"

        android:fragment="com.android.settings.inputmethod.TrackpadSettings"

        settings:controller="com.android.settings.inputmethod.TrackpadSettingsController"/>

        android:fragment="com.android.settings.inputmethod.TouchpadAndMouseSettings"

        settings:controller="com.android.settings.inputmethod.TouchpadAndMouseSettingsController"/>



    <Preference

        android:key="gesture_settings"

res/xml/touchpad_settings.xml

0 → 100644
+78 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  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.

-->



<PreferenceScreen

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

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

    android:title="@string/trackpad_settings">

    <Preference

        android:key="trackpad_gesture_settings"

        android:title="@string/trackpad_touchpad_gesture_title"

        android:summary="@string/trackpad_touchpad_gesture_summary"

        android:order="-10"

        android:fragment="com.android.settings.inputmethod.TrackpadTouchGestureSettings"

        settings:controller="com.android.settings.inputmethod.TrackpadTouchGestureSettingsController"/>



    <SwitchPreferenceCompat

        android:key="trackpad_tap_to_click"

        android:title="@string/trackpad_tap_to_click"

        settings:controller="com.android.settings.inputmethod.TrackpadTapToClickPreferenceController"

        android:order="10"/>



    <SwitchPreferenceCompat

        android:key="trackpad_reverse_scrolling"

        android:title="@string/trackpad_reverse_scrolling_title"

        android:summary="@string/trackpad_reverse_scrolling_summary"

        settings:controller="com.android.settings.inputmethod.TrackpadReverseScrollingPreferenceController"

        android:order="20"/>



    <SwitchPreferenceCompat

        android:key="trackpad_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"

        android:order="30"

        settings:keywords="@string/keywords_trackpad_bottom_right_tap"/>



    <SwitchPreferenceCompat

        android:key="trackpad_tap_dragging"

        android:title="@string/trackpad_tap_dragging_title"

        android:summary="@string/trackpad_tap_dragging_summary"

        settings:controller="com.android.settings.inputmethod.TrackpadTapDraggingPreferenceController"

        android:order="35"/>



    <com.android.settings.widget.SeekBarPreference

        android:key="trackpad_pointer_speed"

        android:title="@string/trackpad_pointer_speed"

        android:order="40"

        android:selectable="false"

        settings:controller="com.android.settings.inputmethod.TrackpadPointerSpeedPreferenceController"/>



    <Preference

        android:fragment="com.android.settings.inputmethod.PointerTouchpadFragment"

        android:key="pointer_and_touchpad"

        android:order="50"

        android:persistent="false"

        android:title="@string/accessibility_pointer_and_touchpad_title"

        android:summary="@string/accessibility_pointer_and_touchpad_summary"

        settings:searchable="true"/>



    <com.android.settingslib.widget.ButtonPreference

        android:key="trackpad_touch_gesture"

        android:title="@string/trackpad_touch_gesture"

        settings:controller="com.android.settings.inputmethod.TouchGesturesButtonPreferenceController"/>

</PreferenceScreen>

src/com/android/settings/core/gateway/SettingsGateway.java

+2 −2
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ import com.android.settings.inputmethod.ModifierKeysSettings; 
import com.android.settings.inputmethod.NewKeyboardLayoutEnabledLocalesFragment;

import com.android.settings.inputmethod.PhysicalKeyboardFragment;

import com.android.settings.inputmethod.SpellCheckersSettings;

import com.android.settings.inputmethod.TrackpadSettings;

import com.android.settings.inputmethod.TouchpadAndMouseSettings;

import com.android.settings.inputmethod.UserDictionaryList;

import com.android.settings.inputmethod.UserDictionarySettings;

import com.android.settings.language.LanguageSettings;
@@ -237,7 +237,7 @@ public class SettingsGateway { 
            KeyboardSettings.class.getName(),

            ModifierKeysSettings.class.getName(),

            NewKeyboardLayoutEnabledLocalesFragment.class.getName(),

            TrackpadSettings.class.getName(),

            TouchpadAndMouseSettings.class.getName(),

            SpellCheckersSettings.class.getName(),

            UserDictionaryList.class.getName(),

            UserDictionarySettings.class.getName(),