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

Commit 19d623d9 authored by Weilun Du's avatar Weilun Du
Browse files

Revert "Update preferences to Material Next styling" 

Revert "Add dependency for settings activity collapsing toolbar"

Revert submission 14740617-collapse3

Reason for revert: Build breakage
Reverted Changes:
I5ef658979:Add dependency for settings activity collapsing to...
I0ca55eecb:Update preferences to Material Next styling

Bug: 189919452
Change-Id: I4aa0bfc473334266a951d84064b4e8e406fff0a4
parent 9b8ab05a

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ android_library { 
        "androidx.preference_preference",

        "androidx.slice_slice-view",

        "androidx.cardview_cardview",

        "com.google.android.material_material",

        "iconloader_base",

    ],

    manifest: "AndroidManifest-common.xml",

AndroidManifest-common.xml

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ 
        <activity

            android:name="com.android.launcher3.settings.SettingsActivity"

            android:label="@string/settings_button_text"

            android:theme="@style/HomeSettings.Theme"

            android:theme="@style/HomeSettingsTheme"

            android:exported="true"

            android:autoRemoveFromRecents="true">

            <intent-filter>

res/color-v31/home_settings_switch_thumb_color.xml

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

<!--

  Copyright (C) 2021 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.

-->



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

    <!-- Disabled status of thumb -->

    <item android:state_enabled="false"

        android:color="@color/home_settings_thumb_off_color" />

    <!-- Toggle off status of thumb -->

    <item android:state_checked="false"

        android:color="@color/home_settings_thumb_off_color" />

    <!-- Enabled or toggle on status of thumb -->

    <item android:color="@color/home_settings_state_on_color" />

</selector>

res/color-v31/home_settings_switch_track_color.xml

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

<!--

  Copyright (C) 2021 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.

-->



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

    <!-- Disabled status of thumb -->

    <item android:state_enabled="false"

        android:color="@color/home_settings_track_off_color"

        android:alpha="?android:attr/disabledAlpha" />

    <!-- Toggle off status of thumb -->

    <item android:state_checked="false"

        android:color="@color/home_settings_track_off_color" />

    <!-- Enabled or toggle on status of thumb -->

    <item android:color="@color/home_settings_track_on_color" />

</selector>

res/drawable-v31/home_settings_switch_thumb.xml

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

<!--

  Copyright (C) 2021 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.

-->



<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:top="4dp"

        android:left="4dp"

        android:right="4dp"

        android:bottom="4dp">

        <shape android:shape="oval" >

            <size android:height="20dp" android:width="20dp" />

            <solid android:color="@color/home_settings_switch_thumb_color" />

        </shape>

    </item>

</layer-list>
 
 No newline at end of file