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

Commit 6346a953 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Expressive design] Remove extra background of MainSwitchPreference." into main

parents d4ad552c 2b504a27

res/xml/mobile_network_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:key="mobile_network_pref_screen">



    <com.android.settings.spa.preference.ComposePreference

    <com.android.settings.spa.preference.ComposeMainSwitchPreference

        android:key="use_sim_switch"

        settings:controller="com.android.settings.network.telephony.MobileNetworkSwitchController"/>

src/com/android/settings/spa/preference/ComposePreference.kt

+8 −0
Original line number Diff line number Diff line
@@ -26,6 +26,14 @@ import androidx.preference.Preference 
import androidx.preference.PreferenceViewHolder

import com.android.settings.R

import com.android.settingslib.spa.framework.theme.SettingsTheme

import com.android.settingslib.widget.GroupSectionDividerMixin



open class ComposeMainSwitchPreference @JvmOverloads constructor(

    context: Context,

    attrs: AttributeSet? = null,

    defStyleAttr: Int = 0,

    defStyleRes: Int = 0,

) : ComposePreference(context, attrs, defStyleAttr, defStyleRes), GroupSectionDividerMixin



open class ComposePreference @JvmOverloads constructor(

    context: Context,