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

Commit c64add5f authored by Mike Schneider's avatar Mike Schneider Committed by Android (Google) Code Review
Browse files

Merge "Revert "Split settingslib_main_switch"" into main

parents 361d88e6 ccc8d785

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

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2023 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



<Switch

    xmlns:android="http://schemas.android.com/apk/res/android"

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

    android:layout_width="wrap_content"

    android:layout_height="48dp"

    android:clickable="false"

    android:focusable="false"

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

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

+8 −1
Original line number Diff line number Diff line
@@ -47,7 +47,14 @@ 
            android:textAppearance="?android:attr/textAppearanceListItem"

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



        <include layout="@layout/settingslib_main_switch" />

        <Switch

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

            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"/>

    </LinearLayout>



</LinearLayout>

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

+8 −1
Original line number Diff line number Diff line
@@ -49,7 +49,14 @@ 
            android:lineBreakWordStyle="phrase"

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



        <include layout="@layout/settingslib_main_switch" />

        <Switch

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

            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"/>

    </LinearLayout>



</LinearLayout>

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

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2023 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



<Switch

    xmlns:android="http://schemas.android.com/apk/res/android"

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

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:clickable="false"

    android:focusable="false"

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

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

+8 −1
Original line number Diff line number Diff line
@@ -38,6 +38,13 @@ 
        android:layout_marginStart="@dimen/settingslib_switchbar_subsettings_margin_start"

        android:textAlignment="viewStart"/>



    <include layout="@layout/settingslib_main_switch" />

    <Switch

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

        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"/>

</LinearLayout>