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

Commit dc191a54 authored by Santiago Etchebehere's avatar Santiago Etchebehere
Browse files

Update the switch styles 

To match the updated style in Settings

Bug: 390233022
Test: visually verified
Flag: com.android.systemui.shared.new_customization_picker_ui
Change-Id: Ic91b1b06bb316c0ac86887d405c2afef4ff9e63b
parent a01656c8

res/layout/floating_sheet_app_icon.xml

+6 −10
Original line number Diff line number Diff line
@@ -66,21 +66,17 @@ 
        android:layout_marginHorizontal="@dimen/floating_sheet_content_horizontal_padding"

        android:orientation="horizontal">



        <TextView

            android:id="@+id/themed_icon_title"

            style="@style/SectionTitleTextStyle"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:text="@string/themed_icon_title" />



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

            style="@style/SettingslibSwitchStyle.Expressive"

            android:id="@+id/themed_icon_toggle"

            android:layout_width="wrap_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:background="@null"

            android:focusable="false"

            android:focusable="true"

            android:clickable="true"

            android:minHeight="0dp"

            android:text="@string/themed_icon_title"

            android:textAppearance="@style/SectionTitleTextStyle"

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

    </LinearLayout>

</LinearLayout>
 
 No newline at end of file

res/layout/floating_sheet_clock_size_content.xml

+2 −0
Original line number Diff line number Diff line
@@ -48,10 +48,12 @@ 
        app:layout_constraintBottom_toBottomOf="parent" />



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

        style="@style/SettingslibSwitchStyle.Expressive"

        android:id="@+id/clock_style_clock_size_switch"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginEnd="@dimen/floating_sheet_content_horizontal_padding"

        android:clickable="true"

        app:layout_constraintTop_toTopOf="@+id/clock_style_clock_size_title"

        app:layout_constraintBottom_toBottomOf="@+id/clock_style_clock_size_description"

        app:layout_constraintEnd_toEndOf="parent"

res/layout/floating_sheet_colors.xml

+4 −9
Original line number Diff line number Diff line
@@ -57,21 +57,16 @@ 
            android:layout_marginHorizontal="@dimen/floating_sheet_content_horizontal_padding"

            android:orientation="horizontal">



            <TextView

                android:id="@+id/dark_mode_toggle_title"

                style="@style/SectionTitleTextStyle"

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_weight="1"

                android:text="@string/mode_title" />



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

                style="@style/SettingslibSwitchStyle.Expressive"

                android:id="@+id/dark_mode_toggle"

                android:layout_width="wrap_content"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                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>

src/com/android/wallpaper/customization/ui/binder/ColorsFloatingSheetBinder.kt

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ object ColorsFloatingSheetBinder { 
        ColorUpdateBinder.bind(

            setColor = { color ->

                view.requireViewById<TextView>(R.id.color_type_tab_subhead).setTextColor(color)

                view.requireViewById<TextView>(R.id.dark_mode_toggle_title).setTextColor(color)

                view.requireViewById<TextView>(R.id.dark_mode_toggle).setTextColor(color)

            },

            color = colorUpdateViewModel.colorOnSurface,

            shouldAnimate = isFloatingSheetActive,