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

Commit b547394a authored by shaoweishen's avatar shaoweishen Committed by Shaowei Shen
Browse files

[Physical Keyboard] Update seekbars 

Update seekbars color and style.

Bug: 374030364
Bug: 399285693
Flag: com.android.settings.keyboard.keyboard_and_touchpad_a11y_new_page_enabled
Test: atest
packages/apps/Settings/tests/robotests/src/com/android/settings/inputmethod/

Change-Id: I251a7241b614114a5bb9d5090fcd22cb873ebc51
parent de3ec7e3

res/layout/dialog_keyboard_a11y_input_setting_keys.xml

+30 −12
Original line number Diff line number Diff line
@@ -122,20 +122,38 @@ 
                        android:layout_gravity="center_vertical"

                        android:layout_marginTop="8dp"

                        android:visibility="gone"/>

                    <LinearLayout

                        android:id="@+id/input_setting_keys_custom_seekbar_layout"

                        android:orientation="horizontal"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:layout_gravity="center_horizontal"

                        android:gravity="center_vertical"

                        android:paddingEnd="36dp">

                        <ImageView

                            android:layout_marginTop="8dp"

                            android:layout_width="16dp"

                            android:layout_height="16dp"

                            android:tint="@androidprv:color/materialColorPrimary"

                            android:importantForAccessibility="no"

                            android:src="@drawable/ic_remove_24dp" />

                        <SeekBar

                            android:id="@+id/input_setting_keys_value_custom_slider"

                        android:paddingStart="8dp"

                        android:paddingEnd="36dp"

                            style="@android:style/Widget.Material.SeekBar"

                            android:min="1"

                            android:max="50"

                        android:progressBackgroundTint="@color/input_dialog_slider_progress_background"

                        android:progressTint="@color/input_dialog_slider_progress"

                        android:thumbTint="@color/input_dialog_slider_progress"

                            android:layout_width="match_parent"

                            android:layout_height="wrap_content"

                            android:layout_gravity="center_vertical"

                            android:layout_marginTop="8dp" />

                        <ImageView

                            android:layout_marginTop="8dp"

                        android:visibility="gone"/>

                            android:layout_width="16dp"

                            android:layout_height="16dp"

                            android:tint="@androidprv:color/materialColorPrimary"

                            android:importantForAccessibility="no"

                            android:src="@drawable/ic_add_24dp" />

                    </LinearLayout>

                </LinearLayout>

            </LinearLayout>

        </RadioGroup>

res/values-night/colors.xml

+0 −3
Original line number Diff line number Diff line
@@ -94,8 +94,5 @@ 
    <!-- Volume seekbar colors -->

    <color name="seekbar_thumb_tint_color">@android:color/system_accent1_100</color>

    <color name="seekbar_progress_tint_color">@android:color/system_accent1_100</color>



    <!-- Keyboard a11y input dialog -->

    <color name="input_dialog_slider_progress">@android:color/system_on_primary_container_dark</color>

</resources>

res/values/colors.xml

+0 −4
Original line number Diff line number Diff line
@@ -275,8 +275,4 @@ 
    <color name="seekbar_thumb_tint_color">@android:color/system_accent1_800</color>

    <color name="seekbar_progress_tint_color">@android:color/system_accent1_800</color>

    <color name="seekbar_progress_background_tint_color">@android:color/system_neutral2_50</color>



    <!-- Keyboard a11y input dialog -->

    <color name="input_dialog_slider_progress">@android:color/system_on_primary_dark</color>

    <color name="input_dialog_slider_progress_background">@android:color/system_outline_light</color>

</resources>

res/xml/mouse_settings.xml

+18 −26
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
        android:order="10"

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



    <com.android.settings.widget.SeekBarPreference

    <com.android.settings.widget.LabeledSeekBarPreference

        android:key="pointer_speed"

        android:title="@string/pointer_speed"

        android:order="20"
@@ -50,12 +50,6 @@ 
        android:summary="@string/accessibility_pointer_and_touchpad_summary"

        settings:searchable="true"/>



    <PreferenceCategory

        android:key="pointer_category"

        android:persistent="false"

        android:order="51"

        android:title="@string/mouse_scrolling_category_title">



    <SwitchPreferenceCompat

        android:key="mouse_reverse_vertical_scrolling"

        android:order="52"
@@ -69,13 +63,11 @@ 
        android:title="@string/mouse_scrolling_acceleration"

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



        <com.android.settings.widget.SeekBarPreference

    <com.android.settings.widget.LabeledSeekBarPreference

        android:key="mouse_scrolling_speed"

        android:title="@string/mouse_scrolling_speed"

        android:order="60"

        android:selectable="false"

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



    </PreferenceCategory>



</PreferenceScreen>

res/xml/touchpad_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
        settings:controller="com.android.settings.inputmethod.TouchpadAccelerationPreferenceController"

        android:order="38"/>



    <com.android.settings.widget.SeekBarPreference

    <com.android.settings.widget.LabeledSeekBarPreference

        android:key="touchpad_pointer_speed"

        android:title="@string/trackpad_pointer_speed"

        android:order="40"