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

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

Merge "Add Settings page for three finger tap customization" into main

parents e46cab2a 00ec5248

res/layout/touchpad_three_finger_tap_layout.xml

0 → 100644
+82 −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.

  -->



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

    xmlns:tools="http://schemas.android.com/tools"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:gravity="center_vertical"

    android:minHeight="?android:attr/listPreferredItemHeightSmall"

    android:orientation="vertical"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart">



    <RadioGroup

        android:id="@+id/button_holder"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical"

        android:layout_marginTop="@dimen/radio_group_style_padding"

        android:layout_marginBottom="@dimen/radio_group_style_padding"

        tools:ignore="UselessParent">

        <RadioButton android:id="@+id/middle_click"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_margin="@dimen/radio_group_style_padding"

            android:paddingStart="@dimen/radio_group_style_text_padding"

            android:paddingEnd="@dimen/radio_group_style_text_padding"

            android:text="@string/three_finger_tap_middle_click"

            android:textSize="20sp"

            android:textAppearance="?android:attr/textAppearanceListItem" />

        <RadioButton android:id="@+id/launch_gemini"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_margin="@dimen/radio_group_style_padding"

            android:paddingStart="@dimen/radio_group_style_text_padding"

            android:paddingEnd="@dimen/radio_group_style_text_padding"

            android:text="@string/three_finger_tap_launch_gemini"

            android:textSize="20sp"

            android:textAppearance="?android:attr/textAppearanceListItem" />

        <RadioButton android:id="@+id/go_home"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_margin="@dimen/radio_group_style_padding"

            android:paddingStart="@dimen/radio_group_style_text_padding"

            android:paddingEnd="@dimen/radio_group_style_text_padding"

            android:text="@string/three_finger_tap_go_home"

            android:textSize="20sp"

            android:textAppearance="?android:attr/textAppearanceListItem" />

        <RadioButton android:id="@+id/go_back"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_margin="@dimen/radio_group_style_padding"

            android:paddingStart="@dimen/radio_group_style_text_padding"

            android:paddingEnd="@dimen/radio_group_style_text_padding"

            android:text="@string/three_finger_tap_go_back"

            android:textSize="20sp"

            android:textAppearance="?android:attr/textAppearanceListItem" />

        <RadioButton android:id="@+id/recent_apps"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_margin="@dimen/radio_group_style_padding"

            android:paddingStart="@dimen/radio_group_style_text_padding"

            android:paddingEnd="@dimen/radio_group_style_text_padding"

            android:text="@string/three_finger_tap_recent_apps"

            android:textSize="20sp"

            android:textAppearance="?android:attr/textAppearanceListItem" />

    </RadioGroup>



</LinearLayout>
 
 No newline at end of file

res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -200,6 +200,8 @@ 
    <dimen name="pointer_scale_padding">8dp</dimen>

    <item name="pointer_scale_size_start" format="float" type="dimen">1.0</item>

    <item name="pointer_scale_size_end" format="float" type="dimen">2.5</item>

    <dimen name="radio_group_style_padding">8dp</dimen>

    <dimen name="radio_group_style_text_padding">21dp</dimen>



    <!-- RemoteAuth-->

    <dimen name="remoteauth_fragment_padding_horizontal">40dp</dimen>

res/values/strings.xml

+12 −0
Original line number Diff line number Diff line
@@ -4649,6 +4649,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 '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 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] -->
@@ -4677,6 +4679,16 @@ 
    <string name="keywords_touchpad">trackpad, track pad, mouse, cursor, scroll, swipe, right click, click, pointer</string>

    <!-- Search keywords for 'Bottom-right tap', the name of the touchpad setting that allows the user to click the bottom right corner of the touchpad for more options. -->

    <string name="keywords_trackpad_bottom_right_tap">right click, tap</string>

    <!-- Radio button text for 'middle click' action. This is one of multiple actions the user can select from the three finger tap customization radio group. The action if selected will act as a middle-click when a three-finger tap is performed on a touchpad. [CHAR LIMIT=35] -->

    <string name="three_finger_tap_middle_click">Middle click</string>

    <!-- Radio button text for 'launch gemini' action. This is one of multiple actions the user can select from the three finger tap customization radio group. The action if selected will launch Gemini when a three-finger tap is performed on a touchpad. [CHAR LIMIT=35] -->

    <string name="three_finger_tap_launch_gemini">Launch Gemini</string>

    <!-- Radio button text for 'Go home' action. This is one of multiple actions the user can select from the three finger tap customization radio group. The action if selected will take the user home when a three-finger tap is performed on a touchpad. [CHAR LIMIT=35] -->

    <string name="three_finger_tap_go_home">Go home</string>

    <!-- Radio button text for 'Go back' action. This is one of multiple actions the user can select from the three finger tap customization radio group. The action if selected will initiate a back gesture when a three-finger tap is performed on a touchpad. [CHAR LIMIT=35] -->

    <string name="three_finger_tap_go_back">Go back</string>

    <!-- Radio button text for 'View recent apps' action. This is one of multiple actions the user can select from the three finger tap customization radio group. The action if selected will show the recent apps when a three-finger tap is performed on a touchpad. [CHAR LIMIT=35] -->

    <string name="three_finger_tap_recent_apps">View recent apps</string>









    <!-- Title text for 'Go home' gesture education [CHAR LIMIT=35] -->









    <string name="gesture_title_go_home">Go home</string>

























res/xml/input_touchpad_three_finger_tap_customization.xml
0 → 100644



+29
−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="input_touchpad_three_finger_tap"









    android:persistent="false"









    android:title="@string/three_finger_tap_preference_title">



















    <com.android.settings.inputmethod.TouchpadThreeFingerTapSelector









        android:key="input_touchpad_three_finger_tap_preference"









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





























</PreferenceScreen>
























res/xml/trackpad_settings.xml



+7
−0






























Original line number
Diff line number
Diff line







@@ -55,6 +55,13 @@







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









        android:order="35"/>



















    <Preference









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









        android:key="three_finger_tap"









        android:title="@string/three_finger_tap_preference_title"









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









        android:order="37"/>



















    <com.android.settings.widget.SeekBarPreference









        android:key="trackpad_pointer_speed"









        android:title="@string/trackpad_pointer_speed"