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

Commit 5dccf4c2 authored by shaoweishen's avatar shaoweishen
Browse files

[Physical Keyboard] Update strings and descriptions 

Update pointer speed preference to match with markup.
we already have pointer speed option under mouse setting page.

Bug: 405833943
Bug: 409173731
Bug: 364122861
Flag: EXEMPT bugfix
Test: atest
packages/apps/Settings/tests/robotests/src/com/android/settings/inputmethod/

Change-Id: I7aa3e2937bf9d1cd2895aac1c5067e7835ebc911
parent 44215796

res/values/strings.xml

+18 −2
Original line number Diff line number Diff line
@@ -4868,6 +4868,10 @@ 
    <string name="mouse_scrolling_acceleration">Controlled scrolling</string>

    <!-- Title for the 'Scrolling speed' slider seekbar, which controls how fast content scrolls when the user moves the scroll wheel. [CHAR LIMIT=60]-->

    <string name="mouse_scrolling_speed">Scrolling speed</string>

    <!-- Description for the button that makes mouse pointer speed faster. [CHAR_LIMIT=NONE] -->

    <string name="mouse_pointer_speed_make_faster_desc">Make pointer faster</string>

    <!-- Description for the button that makes mouse pointer speed slower. [CHAR_LIMIT=NONE] -->

    <string name="mouse_pointer_speed_make_slower_desc">Make pointer slower</string>

    <!-- Title for the 'Swap buttons' preference switch, which swaps the left and right buttons of connected mice so that right click will be the primary action button and left clicking will be the secondary action, for example showing the context menu. [CHAR LIMIT=60] -->

    <string name="mouse_swap_primary_button">Swap primary mouse button</string>

    <!-- Summary text for the 'Swap buttons' preference switch indicating to users that when this switch is enabled, their left click will behave as though it is the right click (secondary action) and that the right click will be the primary action. [CHAR LIMIT=NONE] -->
@@ -4918,7 +4922,7 @@ 
    <!-- Title text for 'Tap dragging', a touchpad setting which allows dragging of UI elements by tapping the touchpad with a single finger and then moving it. [CHAR LIMIT=35] -->

    <string name="trackpad_tap_dragging_title">Tap and drag to move items</string>

    <!-- Summary text for 'Tap dragging', a touchpad setting which allows dragging of UI elements by tapping the touchpad with a single finger and then moving it. [CHAR LIMIT=60] -->

    <string name="trackpad_tap_dragging_summary">Double-tap an item, hold down on the second tap, and then drag the item to move it</string>

    <string name="trackpad_tap_dragging_summary">Double-tap and drag your finger on the touchpad to move objects</string>

    <!-- Title text for 'Touchpad gestures' [CHAR LIMIT=35] -->

    <string name="trackpad_touchpad_gesture_title">Touchpad gestures</string>

    <!-- Summary text for 'Touchpad gestures' [CHAR LIMIT=60] -->
@@ -4933,6 +4937,10 @@ 
    <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">Pointer speed</string>

    <!-- Description for the button that makes touchpad pointer speed faster. [CHAR_LIMIT=NONE] -->

    <string name="trackpad_pointer_speed_make_faster_desc">Make pointer faster</string>

    <!-- Description for the button that makes touchpad pointer speed slower. [CHAR_LIMIT=NONE] -->

    <string name="trackpad_pointer_speed_make_slower_desc">Make pointer slower</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] -->
@@ -5055,10 +5063,18 @@ 
    <string name="keyboard_repeat_keys_title">Repeat Keys</string>

    <!-- Title for the keyboard repeat key timeout option. [CHAR LIMIT=60] -->

    <string name="keyboard_repeat_keys_timeout_title">Delay before repeat</string>

    <!-- Description for the button that increase repeat key delay. [CHAR_LIMIT=NONE] -->

    <string name="keyboard_repeat_keys_increase_delay_desc">Increase delay</string>

    <!-- Description for the button that decrease repeat key delay. [CHAR_LIMIT=NONE] -->

    <string name="keyboard_repeat_keys_decrease_delay_desc">Decrease delay</string>

    <!-- Title for the keyboard repeat key delay option. [CHAR LIMIT=60] -->

    <string name="keyboard_repeat_keys_delay_title">Repeat Rate</string>

    <string name="keyboard_repeat_keys_delay_title">Repeat rate</string>

    <!-- Summary for the keyboard repeat key option. [CHAR LIMIT=NONE] -->

    <string name="keyboard_repeat_keys_summary">Hold down a key to repeat its character until the key is released</string>

    <!-- Description for the button that increase repeat rate. [CHAR_LIMIT=NONE] -->

    <string name="keyboard_repeat_keys_increase_rate_desc">Increase repeat rate</string>

    <!-- Description for the button that decrease repeat rate. [CHAR_LIMIT=NONE] -->

    <string name="keyboard_repeat_keys_decrease_rate_desc">Decrease repeat rate</string>









    <!-- Title text for per IME subtype keyboard layout. [CHAR LIMIT=35] -->









    <string name="ime_label_title"><xliff:g id="ime_label" example="Gboard">%s</xliff:g> layout</string>

























res/xml/keyboard_settings.xml



+0
−8






























Original line number
Diff line number
Diff line







@@ -54,14 +54,6 @@







            settings:controller="com.android.settings.language.UserDictionaryPreferenceController" />









    </PreferenceCategory>



















    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory









        android:key="pointer_category">









        <com.android.settings.PointerSpeedPreference









            android:key="pointer_speed"









            android:title="@string/pointer_speed"









            android:dialogTitle="@string/pointer_speed" />









    </com.android.settingslib.widget.SettingsTitlelessPreferenceCategory>



















    <SwitchPreferenceCompat









        android:key="vibrate_input_devices"









        android:title="@string/vibrate_input_devices"
































res/xml/mouse_settings.xml



+2
−0






























Original line number
Diff line number
Diff line







@@ -35,6 +35,8 @@







        settings:seekBarIncrement="1"









        settings:iconEnd="@drawable/ic_add_24dp"









        settings:iconStart="@drawable/ic_remove_24dp"









        settings:iconEndContentDescription="@string/mouse_pointer_speed_make_faster_desc"









        settings:iconStartContentDescription="@string/mouse_pointer_speed_make_slower_desc"









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



















    <SwitchPreferenceCompat
































res/xml/repeat_key_main_page.xml



+4
−0






























Original line number
Diff line number
Diff line







@@ -33,6 +33,8 @@







        settings:seekBarIncrement="1"









        settings:iconEnd="@drawable/ic_add_24dp"









        settings:iconStart="@drawable/ic_remove_24dp"









        settings:iconEndContentDescription="@string/keyboard_repeat_keys_increase_delay_desc"









        settings:iconStartContentDescription="@string/keyboard_repeat_keys_decrease_delay_desc"









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









    <com.android.settingslib.widget.SliderPreference









        android:key="repeat_keys_delay_preference"








@@ -42,5 +44,7 @@







        settings:seekBarIncrement="1"









        settings:iconEnd="@drawable/ic_add_24dp"









        settings:iconStart="@drawable/ic_remove_24dp"









        settings:iconEndContentDescription="@string/keyboard_repeat_keys_increase_rate_desc"









        settings:iconStartContentDescription="@string/keyboard_repeat_keys_decrease_rate_desc"









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









</PreferenceScreen>








 No newline at end of file
























res/xml/touchpad_settings.xml



+2
−0






























Original line number
Diff line number
Diff line







@@ -68,6 +68,8 @@







        android:order="40"









        settings:iconEnd="@drawable/ic_add_24dp"









        settings:iconStart="@drawable/ic_remove_24dp"









        settings:iconEndContentDescription="@string/trackpad_pointer_speed_make_faster_desc"









        settings:iconStartContentDescription="@string/trackpad_pointer_speed_make_slower_desc"









        android:selectable="false"









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