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

Commit 577965f9 authored by Pat Manning's avatar Pat Manning
Browse files

Add Settings for vector-specific PointerIcon fill colors. 

Bug: 305193969
Test: PointerIconLoadingTest
Flag: com.android.systemui.enable_vector_cursor_a11y_settings
Change-Id: I84b4a6d5fde48309c2e3374963f92b8246167628
parent 5ce2589d

res/drawable/pointer_icon_fill_style_background.xml

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

-->

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

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:shape="rectangle">

    <corners android:radius="16dp" />

    <solid android:color="?androidprv:attr/materialColorSurface"/>

</shape>

res/layout/pointer_icon_fill_style_layout.xml

0 → 100644
+102 −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"

    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">



    <TextView

        android:id="@+id/title"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="@dimen/pointer_fill_style_circle_padding"

        android:text="@string/pointer_fill_style"

        android:textAlignment="viewStart"

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



    <HorizontalScrollView

        android:layout_width="match_parent"

        android:layout_height="wrap_content">



        <LinearLayout

            android:id="@+id/button_holder"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginBottom="@dimen/pointer_fill_style_circle_padding"

            android:layout_marginTop="@dimen/pointer_fill_style_circle_padding"

            android:background="@drawable/pointer_icon_fill_style_background"

            android:gravity="center_horizontal"

            android:padding="@dimen/pointer_fill_style_circle_padding">



            <ImageView

                android:id="@+id/button_black"

                android:layout_width="@dimen/pointer_fill_style_circle_diameter"

                android:layout_height="@dimen/pointer_fill_style_circle_diameter"

                android:layout_margin="@dimen/pointer_fill_style_circle_padding"

                android:adjustViewBounds="true"

                android:maxWidth="@dimen/pointer_fill_style_circle_diameter"

                android:contentDescription="@string/pointer_fill_style_black_button"

                android:scaleType="fitCenter" />



            <ImageView

                android:id="@+id/button_green"

                android:layout_width="@dimen/pointer_fill_style_circle_diameter"

                android:layout_height="@dimen/pointer_fill_style_circle_diameter"

                android:layout_margin="@dimen/pointer_fill_style_circle_padding"

                android:adjustViewBounds="true"

                android:maxWidth="@dimen/pointer_fill_style_circle_diameter"

                android:contentDescription="@string/pointer_fill_style_green_button"

                android:scaleType="fitCenter" />



            <ImageView

                android:id="@+id/button_yellow"

                android:layout_width="@dimen/pointer_fill_style_circle_diameter"

                android:layout_height="@dimen/pointer_fill_style_circle_diameter"

                android:layout_margin="@dimen/pointer_fill_style_circle_padding"

                android:adjustViewBounds="true"

                android:maxWidth="@dimen/pointer_fill_style_circle_diameter"

                android:contentDescription="@string/pointer_fill_style_yellow_button"

                android:scaleType="fitCenter" />



            <ImageView

                android:id="@+id/button_pink"

                android:layout_width="@dimen/pointer_fill_style_circle_diameter"

                android:layout_height="@dimen/pointer_fill_style_circle_diameter"

                android:layout_margin="@dimen/pointer_fill_style_circle_padding"

                android:adjustViewBounds="true"

                android:maxWidth="@dimen/pointer_fill_style_circle_diameter"

                android:contentDescription="@string/pointer_fill_style_pink_button"

                android:scaleType="fitCenter" />



            <ImageView

                android:id="@+id/button_blue"

                android:layout_width="@dimen/pointer_fill_style_circle_diameter"

                android:layout_height="@dimen/pointer_fill_style_circle_diameter"

                android:layout_margin="@dimen/pointer_fill_style_circle_padding"

                android:adjustViewBounds="true"

                android:maxWidth="@dimen/pointer_fill_style_circle_diameter"

                android:contentDescription="@string/pointer_fill_style_blue_button"

                android:scaleType="fitCenter" />

        </LinearLayout>

    </HorizontalScrollView>



</LinearLayout>

res/values/dimens.xml

+6 −0
Original line number Diff line number Diff line
@@ -174,6 +174,12 @@ 
    <dimen name="keyboard_picker_radius">28dp</dimen>

    <dimen name="keyboard_picker_text_size">16sp</dimen>



    <!-- Pointer -->

    <dimen name="pointer_fill_style_circle_diameter">52dp</dimen>

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

    <dimen name="pointer_fill_style_shape_default_stroke">1dp</dimen>

    <dimen name="pointer_fill_style_shape_hovered_stroke">3dp</dimen>



    <!-- RemoteAuth-->

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

    <dimen name="remoteauth_fragment_subtitle_text_size">14sp</dimen>

res/values/strings.xml

+12 −0
Original line number Diff line number Diff line
@@ -4466,6 +4466,18 @@ 
    <string name="trackpad_bottom_right_tap_summary">Tap 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>

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

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

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

    <string name="pointer_fill_style_green_button">Change pointer fill style to green</string>

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

    <string name="pointer_fill_style_yellow_button">Change pointer fill style to yellow</string>

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

    <string name="pointer_fill_style_pink_button">Change pointer fill style to pink</string>

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

    <string name="pointer_fill_style_blue_button">Change pointer fill style to blue</string>

    <!-- Title for the button to trigger the 'touch gesture' education. [CHAR LIMIT=35] -->

    <string name="trackpad_touch_gesture">Learn touchpad gestures</string>

    <!-- Search keywords for "touchpad" -->

res/xml/trackpad_settings.xml

+7 −0
Original line number Diff line number Diff line
@@ -62,6 +62,13 @@ 
        android:selectable="false"

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



    <com.android.settings.inputmethod.PointerFillStylePreference

        android:key="pointer_fill_style"

        android:title="@string/pointer_fill_style"

        android:order="50"

        android:dialogTitle="@string/pointer_fill_style"

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



    <com.android.settingslib.widget.ButtonPreference

        android:key="trackpad_touch_gesture"

        android:title="@string/trackpad_touch_gesture"