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

Commit f91b6d77 authored by Shaowei Shen's avatar Shaowei Shen Committed by Android (Google) Code Review
Browse files

Merge "[Physical Keyboard] Update to SliderPreference" into main

parents 7f00093f c866f990

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -4932,7 +4932,7 @@ 
    <!-- Summary text for 'Bottom-right click', a setting that allows the user to right-click by pressing in the bottom-right corner of a touchpad [CHAR LIMIT=60] -->

    <string name="trackpad_bottom_right_tap_summary">Click in the bottom right corner of the touchpad for more options</string>

    <!-- Title text for 'Pointer speed'. [CHAR LIMIT=35] -->

    <string name="trackpad_pointer_speed">Cursor speed</string>

    <string name="trackpad_pointer_speed">Pointer speed</string>

    <!-- Title text for 'Three finger tap' touchpad preference. This preference allows the user to select an action that will trigger when they tap three fingers on a touchpad. [CHAR LIMIT=60] -->

    <string name="three_finger_tap_preference_title">Use three-finger tap</string>

    <!-- Title for the 'Touchpad acceleration' preference switch, which dynamically adjusts cursor movement based on speed. [CHAR LIMIT=60] -->

res/xml/mouse_settings.xml

+9 −3
Original line number Diff line number Diff line
@@ -27,11 +27,14 @@ 
        android:order="10"

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



    <com.android.settings.widget.LabeledSeekBarPreference

    <com.android.settingslib.widget.SliderPreference

        android:key="pointer_speed"

        android:title="@string/pointer_speed"

        android:order="20"

        android:selectable="false"

        settings:seekBarIncrement="1"

        settings:iconEnd="@drawable/ic_add_24dp"

        settings:iconStart="@drawable/ic_remove_24dp"

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



    <SwitchPreferenceCompat
@@ -63,11 +66,14 @@ 
        android:title="@string/mouse_scrolling_acceleration"

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



    <com.android.settings.widget.LabeledSeekBarPreference

    <com.android.settingslib.widget.SliderPreference

        android:key="mouse_scrolling_speed"

        android:title="@string/mouse_scrolling_speed"

        android:order="60"

        android:selectable="false"

        android:title="@string/mouse_scrolling_speed"

        settings:iconEnd="@drawable/ic_add_24dp"

        settings:iconStart="@drawable/ic_remove_24dp"

        settings:seekBarIncrement="1"

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



</PreferenceScreen>

res/xml/repeat_key_main_page.xml

+6 −2
Original line number Diff line number Diff line
@@ -25,18 +25,22 @@ 
        android:key="repeat_keys_main_switch"

        android:title="@string/keyboard_repeat_keys_title"

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

    <com.android.settings.widget.LabeledSeekBarPreference

    <com.android.settingslib.widget.SliderPreference

        android:key="repeat_keys_timeout_preference"

        android:title="@string/keyboard_repeat_keys_timeout_title"

        android:min="0"

        android:max="6"

        settings:seekBarIncrement="1"

        settings:iconEnd="@drawable/ic_add_24dp"

        settings:iconStart="@drawable/ic_remove_24dp"

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

    <com.android.settings.widget.LabeledSeekBarPreference

    <com.android.settingslib.widget.SliderPreference

        android:key="repeat_keys_delay_preference"

        android:title="@string/keyboard_repeat_keys_delay_title"

        android:min="0"

        android:max="8"

        settings:seekBarIncrement="1"

        settings:iconEnd="@drawable/ic_add_24dp"

        settings:iconStart="@drawable/ic_remove_24dp"

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

</PreferenceScreen>
 
 No newline at end of file

res/xml/touchpad_settings.xml

+7 −1
Original line number Diff line number Diff line
@@ -61,10 +61,13 @@ 
        settings:controller="com.android.settings.inputmethod.TouchpadAccelerationPreferenceController"

        android:order="38"/>



    <com.android.settings.widget.LabeledSeekBarPreference

    <com.android.settingslib.widget.SliderPreference

        android:key="touchpad_pointer_speed"

        android:title="@string/trackpad_pointer_speed"

        settings:seekBarIncrement="1"

        android:order="40"

        settings:iconEnd="@drawable/ic_add_24dp"

        settings:iconStart="@drawable/ic_remove_24dp"

        android:selectable="false"

        settings:controller="com.android.settings.inputmethod.TouchpadPointerSpeedPreferenceController"/>
@@ -80,6 +83,9 @@ 
    <com.android.settingslib.widget.ButtonPreference

        android:key="touchpad_touch_gesture"

        android:title="@string/trackpad_touch_gesture"

        android:icon="@drawable/ic_settings_gestures"

        settings:buttonPreferenceSize="large"

        settings:buttonPreferenceType="filled"

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



    <com.android.settingslib.widget.FooterPreference

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

+5 −3
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ import com.android.settings.R; 
import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.keyboard.Flags;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.widget.LabeledSeekBarPreference;

import com.android.settingslib.utils.ThreadUtils;

import com.android.settingslib.widget.SliderPreference;



import java.util.List;
@@ -62,9 +62,9 @@ public class KeyboardRepeatKeysMainFragment extends DashboardFragment 
    private InputManager mInputManager;

    private ContentResolver mContentResolver;

    @Nullable

    private LabeledSeekBarPreference mRepeatTimeoutPreference;

    private SliderPreference mRepeatTimeoutPreference;

    @Nullable

    private LabeledSeekBarPreference mRepeatDelayPreference;

    private SliderPreference mRepeatDelayPreference;



    @Override

    public int getMetricsCategory() {
@@ -117,6 +117,8 @@ public class KeyboardRepeatKeysMainFragment extends DashboardFragment 
        if (mRepeatTimeoutPreference != null && mRepeatDelayPreference != null) {

            mRepeatTimeoutPreference.setEnabled(isRepeatKeyEnabled);

            mRepeatDelayPreference.setEnabled(isRepeatKeyEnabled);

            mRepeatTimeoutPreference.setTickVisible(true);

            mRepeatDelayPreference.setTickVisible(true);

        }

    }