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

Commit f4b8d7ef authored by Catherine Liang's avatar Catherine Liang
Browse files

Fix dark theme voice access 

The outer linear layout should not be clickable, and the inner switch
should be focusable and clickable. After removing the
accessibility-related properties, the default functions correctly. Also
remove the outer linear layout since it is redundant.

Flag: com.android.systemui.shared.new_customization_picker_ui
Bug: 417382946
Test: manually verified with voice access, talkback, switch access
Change-Id: Id39c09f4d5581a114c8fe565d86f3199d2fbf649
parent 8a0638c6

res/layout/floating_sheet_colors.xml

+9 −18
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginBottom="16dp"

            android:layout_marginHorizontal="20dp"

            android:layout_marginHorizontal="@dimen/floating_sheet_content_horizontal_padding"

            android:gravity="center"

            android:text="@string/wallpaper_color_subheader"

            android:textColor="@color/system_on_surface"
@@ -49,27 +49,18 @@ 
            android:clipChildren="false"

            android:clipToPadding="false" />



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:clickable="true"

            android:gravity="center_vertical"

            android:layout_marginHorizontal="@dimen/floating_sheet_content_horizontal_padding"

            android:orientation="horizontal">



        <com.google.android.material.materialswitch.MaterialSwitch

            style="@style/SettingslibSwitchStyle.Expressive"

            android:id="@+id/dark_mode_toggle"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginHorizontal="@dimen/floating_sheet_content_horizontal_padding"

            android:background="@null"

                android:focusable="false"

            android:minHeight="0dp"

            android:text="@string/mode_title"

            android:textAppearance="@style/SectionTitleTextStyle"

            android:theme="@style/Theme.Material3.DynamicColors.DayNight" />

    </LinearLayout>

    </LinearLayout>



    <com.android.wallpaper.picker.customization.ui.view.FloatingToolbar

        android:id="@+id/floating_toolbar"