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

Commit f8e2f788 authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "Migrate MainSwitchBar to Material3" into main

parents 98ad7769 826a4b8d

packages/SettingsLib/MainSwitchPreference/res/layout-v31/settingslib_main_switch_bar.xml

+4 −6
Original line number Diff line number Diff line
@@ -47,14 +47,12 @@ 
            android:textAppearance="?android:attr/textAppearanceListItem"

            style="@style/MainSwitchText.Settingslib" />



        <Switch

        <include

            android:id="@android:id/switch_widget"

            layout="@layout/preference_widget_switch_compat"

            android:layout_width="wrap_content"

            android:layout_height="48dp"

            android:layout_gravity="center_vertical"

            android:focusable="false"

            android:clickable="false"

            android:theme="@style/Switch.SettingsLib"/>

            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical" />

    </LinearLayout>



</LinearLayout>

packages/SettingsLib/MainSwitchPreference/res/layout-v33/settingslib_main_switch_bar.xml

+4 −6
Original line number Diff line number Diff line
@@ -49,14 +49,12 @@ 
            android:lineBreakWordStyle="phrase"

            style="@style/MainSwitchText.Settingslib" />



        <Switch

        <include

            android:id="@android:id/switch_widget"

            layout="@layout/preference_widget_switch_compat"

            android:layout_width="wrap_content"

            android:layout_height="48dp"

            android:layout_gravity="center_vertical"

            android:focusable="false"

            android:clickable="false"

            android:theme="@style/Switch.SettingsLib"/>

            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical" />

    </LinearLayout>



</LinearLayout>

packages/SettingsLib/MainSwitchPreference/res/layout/settingslib_main_switch_bar.xml

+3 −5
Original line number Diff line number Diff line
@@ -38,13 +38,11 @@ 
        android:layout_marginStart="@dimen/settingslib_switchbar_subsettings_margin_start"

        android:textAlignment="viewStart"/>



    <Switch

    <include

        android:id="@android:id/switch_widget"

        layout="@layout/preference_widget_switch_compat"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:focusable="false"

        android:clickable="false"

        android:theme="@style/SwitchBar.Switch.Settingslib"/>

        android:layout_gravity="center_vertical" />

</LinearLayout>