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

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

Merge "Move pointer and touchpad customization settings to their own pages." into main

parents b9cef19f 753b476a

res/drawable/ic_pointer_and_touchpad.xml

0 → 100644
+35 −0
Original line number Diff line number Diff line 
<!--

  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.

  -->



<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item>

        <com.android.settingslib.widget.AdaptiveIconShapeDrawable

            android:width="@dimen/accessibility_icon_size"

            android:height="@dimen/accessibility_icon_size"

            android:color="@color/accessibility_feature_background"/>

    </item>

    <item android:gravity="center">

        <vector

            android:height="32dp"

            android:width="32dp"

            android:viewportHeight="32"

            android:viewportWidth="32">

            <path

                android:fillColor="#fff"

                android:pathData="M19.15,22.35a2.6,2.6 0,0 0,1.91 -0.79,2.6 2.6,0 0,0 0.79,-1.91v-0.9h-5.4v0.9c0,0.75 0.26,1.39 0.79,1.91a2.6,2.6 0,0 0,1.91 0.79ZM16.49,17.4h1.98v-2.17a2.6,2.6 0,0 0,-1.98 2.17ZM19.82,17.4h2a2.6,2.6 0,0 0,-0.68 -1.39,2.62 2.62,0 0,0 -1.32,-0.78v2.17ZM19.15,23.7a3.96,3.96 0,0 1,-4.05 -4.05v-1.8c0,-1.14 0.39,-2.1 1.16,-2.87a3.93,3.93 0,0 1,2.89 -1.18c1.14,0 2.1,0.4 2.87,1.18a3.87,3.87 0,0 1,1.18 2.87v1.8c0,1.14 -0.4,2.1 -1.18,2.89a3.9,3.9 0,0 1,-2.87 1.16ZM10.15,20.55v-8.1,8.1ZM10.15,21.9c-0.38,0 -0.7,-0.13 -0.96,-0.4s-0.39,-0.59 -0.39,-0.95v-8.1c0,-0.36 0.13,-0.67 0.4,-0.94 0.26,-0.27 0.57,-0.41 0.95,-0.41h11.7c0.37,0 0.7,0.14 0.96,0.41 0.26,0.27 0.39,0.58 0.39,0.94L10.15,12.45v8.1h3.6v1.35h-3.6Z"/>

        </vector>

    </item>

</layer-list>
 
 No newline at end of file

res/values/strings.xml

+8 −2
Original line number Diff line number Diff line
@@ -4532,8 +4532,8 @@ 
    <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>

    <!-- Title text for mouse pointer fill style. [CHAR LIMIT=35] -->

    <string name="pointer_fill_style">Pointer fill style</string>

    <!-- Title text for mouse pointer color. [CHAR LIMIT=35] -->

    <string name="pointer_fill_style">Pointer color</string>

    <!-- Content description for black pointer fill style. [CHAR LIMIT=60] -->

    <string name="pointer_fill_style_black_button">Change pointer fill style to black</string>

    <!-- Content description for green pointer fill style. [CHAR LIMIT=60] -->
@@ -4810,6 +4810,12 @@ 
    <string name="display_category_title">Display</string>

    <!-- Title for the accessibility color and motion page. [CHAR LIMIT=50] -->

    <string name="accessibility_color_and_motion_title">Color and motion</string>

    <!-- Title for the accessibility pointer and touchpad page. [CHAR LIMIT=50] -->

    <string name="accessibility_pointer_and_touchpad_title">Pointer &amp; touchpad accessibility</string>

    <!-- Summary for the accessibility pointer and touchpad page. [CHAR LIMIT=50] -->

    <string name="accessibility_pointer_and_touchpad_summary">Pointer color, pointer size &amp; more</string>

    <!-- Title for the accessibility pointer color customization page. [CHAR LIMIT=50] -->

    <string name="accessibility_pointer_color_customization_title">Pointer color customization</string>

    <!-- Title for the accessibility color contrast page. [CHAR LIMIT=50] -->

    <string name="accessibility_color_contrast_title">Color contrast</string>

    <!-- Intro for the accessibility color contrast page. [CHAR LIMIT=NONE] -->

res/xml/accessibility_color_and_motion.xml

+0 −11
Original line number Diff line number Diff line
@@ -72,17 +72,6 @@ 
        android:title="@string/accessibility_toggle_large_pointer_icon_title"

        settings:controller="com.android.settings.accessibility.LargePointerIconPreferenceController"/>



    <com.android.settings.widget.LabeledSeekBarPreference

        android:key="large_pointer_scale"

        android:title="@string/accessibility_toggle_large_pointer_icon_title"

        android:summary="@string/accessibility_toggle_large_pointer_icon_summary"

        android:max="@integer/pointer_scale_seek_bar_end"

        settings:iconStart="@drawable/ic_remove_24dp"

        settings:iconStartContentDescription="@string/pointer_scale_decrease_content_description"

        settings:iconEnd="@drawable/ic_add_24dp"

        settings:iconEndContentDescription="@string/pointer_scale_increase_content_description"

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



    <PreferenceCategory

        android:key="experimental_category"

        android:persistent="false"

res/xml/accessibility_pointer_and_touchpad.xml

0 → 100644
+48 −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:key="accessibility_pointer_and_touchpad"

    android:persistent="false"

    android:title="@string/accessibility_pointer_and_touchpad_title">



    <com.android.settings.widget.LabeledSeekBarPreference

        android:key="pointer_scale_preference"

        android:title="@string/pointer_scale"

        android:max="@integer/pointer_scale_seek_bar_end"

        settings:iconStart="@drawable/ic_remove_24dp"

        settings:iconStartContentDescription="@string/pointer_scale_decrease_content_description"

        settings:iconEnd="@drawable/ic_add_24dp"

        settings:iconEndContentDescription="@string/pointer_scale_increase_content_description"

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



    <Preference

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

        android:key="pointer_color_customization_preference"

        android:persistent="false"

        android:title="@string/accessibility_pointer_color_customization_title"/>



    <Preference

        android:fragment="com.android.settings.accessibility.ToggleAutoclickPreferenceFragment"

        android:key="autoclick_preference"

        android:persistent="false"

        android:title="@string/accessibility_autoclick_preference_title"

        settings:keywords="@string/keywords_auto_click"

        settings:controller="com.android.settings.accessibility.AutoclickPreferenceController"/>



</PreferenceScreen>

res/xml/accessibility_pointer_color_customization.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:key="accessibility_pointer_color_customization"

    android:persistent="false"

    android:title="@string/accessibility_pointer_color_customization_title">



    <com.android.settings.inputmethod.PointerFillStylePreference

        android:key="pointer_fill_style"

        android:title="@string/pointer_fill_style"

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



    <com.android.settings.inputmethod.PointerStrokeStylePreference

        android:key="pointer_stroke_style"

        android:title="@string/pointer_stroke_style"

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



</PreferenceScreen>