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

Commit ec8a994d authored by Brian Isganitis's avatar Brian Isganitis
Browse files

Update preferences to Material Next styling 

There should be enough free space to merge this change into S V2.

Test: Settings root, all apps, and about have new style on S
Bug: 187732263
Fix: 188254205, 188012913
Change-Id: I346bbf819f3fe1eb13b47125b53c15baab11e439
Merged-In: I346bbf819f3fe1eb13b47125b53c15baab11e439
parent be96e2e3

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ 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/HomeSettingsTheme"

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

            android:exported="true"

            android:autoRemoveFromRecents="true">

            <intent-filter>

res/color-v31/home_settings_switch_thumb_color.xml

0 → 100644
+27 −0
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

0 → 100644
+28 −0
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

0 → 100644
+29 −0
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