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

Commit ed79649b authored by Alex Shabalin's avatar Alex Shabalin Committed by Alexandr Shabalin
Browse files

Ensure that button touch targets are at least 48x48 dp. 

This is to comply with a11y requirements. Buttons affected:
- Connect Device button. Touch height: 32dp -> 48dp.
- Add / Remove to a group button. Touch width and height: 40dp -> 48dp.
- Ongoing Session (Jam) button. Touch width and height: 40dp -> 48dp.

Fix: 409006700
Fix: 409007076
Fix: 409009226
Flag: com.android.media.flags.enable_output_switcher_redesign
Test: atest
SystemUIGoogleScreenshotTests:com.android.systemui.media.dialog, with
Accessibility Scanner app.

Change-Id: I6fe04b67f35c630a0b379ca1c4e9b3a74062e92e
parent c7b882bc

packages/SystemUI/res/drawable/media_output_dialog_item_button_ripple.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
    <item android:id="@android:id/mask">

        <shape android:shape="rectangle">

            <solid android:color="@android:color/white" />

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

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

        </shape>

    </item>

</ripple>
 
 No newline at end of file

packages/SystemUI/res/layout/media_output_list_item_device.xml

+1 −2
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ 
            android:layout_weight="1"

            android:layout_height="wrap_content"

            android:minHeight="@dimen/media_output_item_icon_size"

            android:layout_gravity="start"

            android:gravity="center_vertical|start"

            android:orientation="vertical">
@@ -97,7 +96,7 @@ 
        <View

            android:id="@+id/divider"

            android:layout_width="1dp"

            android:layout_height="@dimen/media_output_item_icon_size"

            android:layout_height="40dp"

            android:layout_marginStart="@dimen/media_output_item_horizontal_gap"

            android:background="@color/media_dialog_outline"

            android:visibility="visible"

packages/SystemUI/res/layout/media_output_list_item_group_divider.xml

+2 −2
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ 


        <FrameLayout

            android:id="@+id/expand_button"

            android:layout_width="40dp"

            android:layout_height="40dp"

            android:layout_width="@dimen/media_output_item_icon_size"

            android:layout_height="@dimen/media_output_item_icon_size"

            android:layout_marginStart="@dimen/media_output_item_horizontal_gap"

            android:contentDescription="@string/accessibility_open_application"

            android:focusable="true"

packages/SystemUI/res/values/dimens.xml

+5 −5
Original line number Diff line number Diff line
@@ -1588,11 +1588,11 @@ 
    <dimen name="media_output_dialog_icon_right_radius">0dp</dimen>

    <dimen name="media_output_dialog_corner_radius">20dp</dimen>

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

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

    <dimen name="media_output_item_content_vertical_margin_active">4dp</dimen>

    <dimen name="media_output_item_horizontal_gap">12dp</dimen>

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

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

    <dimen name="media_output_item_content_vertical_margin">4dp</dimen>

    <dimen name="media_output_item_content_vertical_margin_active">0dp</dimen>

    <dimen name="media_output_item_horizontal_gap">4dp</dimen>

    <dimen name="media_output_item_icon_size">48dp</dimen>

    <dimen name="media_output_item_icon_padding">12dp</dimen>

    <dimen name="media_output_item_expand_icon_width">28dp</dimen>

    <dimen name="media_output_item_expand_icon_height">20dp</dimen>

    <item name="media_output_item_subtitle_alpha" format="float" type="dimen">0.8</item>

packages/SystemUI/res/values/styles.xml

+2 −5
Original line number Diff line number Diff line
@@ -712,13 +712,10 @@ 
    <style name="MediaOutput.Dialog" />

    <style name="MediaOutput.Dialog.QuickAccessButton" parent="@style/Widget.Material3.Button.OutlinedButton.Icon">

        <item name="theme">@style/Theme.Material3.DynamicColors.DayNight</item>

        <item name="android:paddingTop">6dp</item>

        <item name="android:minHeight">32dp</item>

        <item name="android:paddingBottom">6dp</item>

        <item name="android:paddingStart">8dp</item>

        <item name="android:paddingEnd">12dp</item>

        <item name="android:insetTop">0dp</item>

        <item name="android:insetBottom">0dp</item>

        <item name="android:insetTop">8dp</item>

        <item name="android:insetBottom">8dp</item>

        <item name="android:textColor">@color/media_dialog_on_surface_variant</item>

        <item name="iconSize">18dp</item>

        <item name="iconTint">@color/media_dialog_primary</item>