PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[3F Tap] Radio Group VisD updates" into main

Browse Source
This commit is contained in:
Treehugger Robot
2025-02-26 08:46:44 -08:00
committed by Android (Google) Code Review
parent 14d3093333 3307af4985
commit 577f341e0e
3 changed files with 43 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
res/layout/touchpad_three_finger_tap_layout.xml
View File

@@ -34,46 +34,61 @@
tools:ignore="UselessParent"> tools:ignore="UselessParent">
<RadioButton android:id="@+id/middle_click" <RadioButton android:id="@+id/middle_click"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="@dimen/three_finger_tap_radio_button_height"
android:layout_margin="@dimen/radio_group_style_padding" android:layout_margin="@dimen/pointer_stroke_style_padding"
android:paddingStart="@dimen/radio_group_style_text_padding" android:gravity="center_vertical"
android:paddingEnd="@dimen/radio_group_style_text_padding" android:paddingTop="@dimen/three_finger_tap_radio_button_vertical_padding"
android:paddingBottom="@dimen/three_finger_tap_radio_button_vertical_padding"
android:paddingStart="@dimen/three_finger_tap_radio_button_text_padding"
android:fontFamily="@*android:string/config_headlineFontFamily"
android:text="@string/three_finger_tap_middle_click" android:text="@string/three_finger_tap_middle_click"
android:textSize="20sp" android:textSize="20sp"
android:textAppearance="?android:attr/textAppearanceListItem" /> android:textAppearance="?android:attr/textAppearanceListItem" />
<RadioButton android:id="@+id/launch_gemini" <RadioButton android:id="@+id/launch_gemini"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="@dimen/three_finger_tap_radio_button_height"
android:layout_margin="@dimen/radio_group_style_padding" android:layout_margin="@dimen/pointer_stroke_style_padding"
android:paddingStart="@dimen/radio_group_style_text_padding" android:gravity="center_vertical"
android:paddingEnd="@dimen/radio_group_style_text_padding" android:paddingTop="@dimen/three_finger_tap_radio_button_vertical_padding"
android:paddingBottom="@dimen/three_finger_tap_radio_button_vertical_padding"
android:paddingStart="@dimen/three_finger_tap_radio_button_text_padding"
android:fontFamily="@*android:string/config_headlineFontFamily"
android:text="@string/three_finger_tap_launch_gemini" android:text="@string/three_finger_tap_launch_gemini"
android:textSize="20sp" android:textSize="20sp"
android:textAppearance="?android:attr/textAppearanceListItem" /> android:textAppearance="?android:attr/textAppearanceListItem" />
<RadioButton android:id="@+id/go_home" <RadioButton android:id="@+id/go_home"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="@dimen/three_finger_tap_radio_button_height"
android:layout_margin="@dimen/radio_group_style_padding" android:layout_margin="@dimen/pointer_stroke_style_padding"
android:paddingStart="@dimen/radio_group_style_text_padding" android:gravity="center_vertical"
android:paddingEnd="@dimen/radio_group_style_text_padding" android:paddingTop="@dimen/three_finger_tap_radio_button_vertical_padding"
android:paddingBottom="@dimen/three_finger_tap_radio_button_vertical_padding"
android:paddingStart="@dimen/three_finger_tap_radio_button_text_padding"
android:fontFamily="@*android:string/config_headlineFontFamily"
android:text="@string/three_finger_tap_go_home" android:text="@string/three_finger_tap_go_home"
android:textSize="20sp" android:textSize="20sp"
android:textAppearance="?android:attr/textAppearanceListItem" /> android:textAppearance="?android:attr/textAppearanceListItem" />
<RadioButton android:id="@+id/go_back" <RadioButton android:id="@+id/go_back"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="@dimen/three_finger_tap_radio_button_height"
android:layout_margin="@dimen/radio_group_style_padding" android:layout_margin="@dimen/pointer_stroke_style_padding"
android:paddingStart="@dimen/radio_group_style_text_padding" android:gravity="center_vertical"
android:paddingEnd="@dimen/radio_group_style_text_padding" android:paddingTop="@dimen/three_finger_tap_radio_button_vertical_padding"
android:paddingBottom="@dimen/three_finger_tap_radio_button_vertical_padding"
android:paddingStart="@dimen/three_finger_tap_radio_button_text_padding"
android:fontFamily="@*android:string/config_headlineFontFamily"
android:text="@string/three_finger_tap_go_back" android:text="@string/three_finger_tap_go_back"
android:textSize="20sp" android:textSize="20sp"
android:textAppearance="?android:attr/textAppearanceListItem" /> android:textAppearance="?android:attr/textAppearanceListItem" />
<RadioButton android:id="@+id/recent_apps" <RadioButton android:id="@+id/recent_apps"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="@dimen/three_finger_tap_radio_button_height"
android:layout_margin="@dimen/radio_group_style_padding" android:layout_margin="@dimen/pointer_stroke_style_padding"
android:paddingStart="@dimen/radio_group_style_text_padding" android:gravity="center_vertical"
android:paddingEnd="@dimen/radio_group_style_text_padding" android:paddingTop="@dimen/three_finger_tap_radio_button_vertical_padding"
android:paddingBottom="@dimen/three_finger_tap_radio_button_vertical_padding"
android:paddingStart="@dimen/three_finger_tap_radio_button_text_padding"
android:fontFamily="@*android:string/config_headlineFontFamily"
android:text="@string/three_finger_tap_recent_apps" android:text="@string/three_finger_tap_recent_apps"
android:textSize="20sp" android:textSize="20sp"
android:textAppearance="?android:attr/textAppearanceListItem" /> android:textAppearance="?android:attr/textAppearanceListItem" />

8
res/values/dimens.xml
View File

@@ -180,6 +180,12 @@
<dimen name="keyboard_picker_radius">28dp</dimen> <dimen name="keyboard_picker_radius">28dp</dimen>
<dimen name="keyboard_picker_text_size">16sp</dimen> <dimen name="keyboard_picker_text_size">16sp</dimen>
<!-- Touchpad 3 finger tap -->
<dimen name="radio_group_style_padding">8dp</dimen>
<dimen name="three_finger_tap_radio_button_vertical_padding">24dp</dimen>
<dimen name="three_finger_tap_radio_button_text_padding">15dp</dimen>
<dimen name="three_finger_tap_radio_button_height">56dp</dimen>
<!-- Pointer --> <!-- Pointer -->
<dimen name="pointer_fill_container_height">80dp</dimen> <dimen name="pointer_fill_container_height">80dp</dimen>
<dimen name="pointer_fill_container_max_width">468dp</dimen> <dimen name="pointer_fill_container_max_width">468dp</dimen>
@@ -209,8 +215,6 @@
<dimen name="pointer_scale_padding">8dp</dimen> <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_start" format="float" type="dimen">1.0</item>
<item name="pointer_scale_size_end" format="float" type="dimen">2.5</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--> <!-- RemoteAuth-->
<dimen name="remoteauth_fragment_padding_horizontal">40dp</dimen> <dimen name="remoteauth_fragment_padding_horizontal">40dp</dimen>

4
res/values/strings.xml
View File

@@ -4857,8 +4857,8 @@
<string name="keywords_touchpad">trackpad, track pad, mouse, cursor, scroll, swipe, right click, click, pointer</string> <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. --> <!-- 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> <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] --> <!-- Radio button text for 'mouse middle click button' 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> <string name="three_finger_tap_middle_click">Mouse middle click button</string>
<!-- Radio button text for 'launch assistant' 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 the Assistant when a three-finger tap is performed on a touchpad. [CHAR LIMIT=35] --> <!-- Radio button text for 'launch assistant' 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 the Assistant when a three-finger tap is performed on a touchpad. [CHAR LIMIT=35] -->
<string name="three_finger_tap_launch_gemini">Launch Assistant</string> <string name="three_finger_tap_launch_gemini">Launch Assistant</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] --> <!-- 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] -->