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

Commit aa6aa7bb authored by Brian Isganitis's avatar Brian Isganitis Committed by Automerger Merge Worker
Browse files

Merge "Update preferences to Material Next styling" into sc-dev am: b177133e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14740617

Change-Id: I591b173c7c0bfdb595daea64da2f5e9e7d2c23f1
parents 161027dc b177133e

Android.bp

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

        "androidx.preference_preference",

        "androidx.slice_slice-view",

        "androidx.slice_slice-view",

        "androidx.cardview_cardview",

        "androidx.cardview_cardview",

        "com.google.android.material_material",

        "iconloader_base",

        "iconloader_base",

    ],

    ],

    manifest: "AndroidManifest-common.xml",

    manifest: "AndroidManifest-common.xml",

AndroidManifest-common.xml

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

        <activity

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

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

            android:label="@string/settings_button_text"

            android:label="@string/settings_button_text"

            android:theme="@style/HomeSettingsTheme"

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

            android:exported="true"

            android:exported="true"

            android:autoRemoveFromRecents="true">

            android:autoRemoveFromRecents="true">

            <intent-filter>

            <intent-filter>

res/color-v31/home_settings_switch_thumb_color.xml

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