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

Commit e3ea9b5d authored by Aashna Jena's avatar Aashna Jena Committed by Android (Google) Code Review
Browse files

Merge "Revert "Migrate MainSwitchBar to Material3"" into main

parents aeabb20b 772a0109

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

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

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



        <include

        <Switch

            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:layout_height="48dp"

            android:layout_gravity="center_vertical"

            android:focusable="false"

            android:clickable="false"

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

    </LinearLayout>



</LinearLayout>

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

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

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



        <include

        <Switch

            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:layout_height="48dp"

            android:layout_gravity="center_vertical"

            android:focusable="false"

            android:clickable="false"

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

    </LinearLayout>



</LinearLayout>

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

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

        android:textAlignment="viewStart"/>



    <include

    <Switch

        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:layout_gravity="center_vertical"

        android:focusable="false"

        android:clickable="false"

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

</LinearLayout>