From 2b504a2762ea6221f1ae13894956caeb1ed71518 Mon Sep 17 00:00:00 2001 From: Yuchen Date: Fri, 6 Dec 2024 03:11:20 +0000 Subject: [PATCH] [Expressive design] Remove extra background of MainSwitchPreference. Bug: 349681531 Flag: EXEMPT bug fix Test: Visual Change-Id: Ib3a0e81b0bd1efbe85ce3992d343ae312e610dd3 --- res/xml/mobile_network_settings.xml | 2 +- .../android/settings/spa/preference/ComposePreference.kt | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/res/xml/mobile_network_settings.xml b/res/xml/mobile_network_settings.xml index c5e6d2f9e56..db37a37af63 100644 --- a/res/xml/mobile_network_settings.xml +++ b/res/xml/mobile_network_settings.xml @@ -18,7 +18,7 @@ xmlns:settings="http://schemas.android.com/apk/res-auto" android:key="mobile_network_pref_screen"> - diff --git a/src/com/android/settings/spa/preference/ComposePreference.kt b/src/com/android/settings/spa/preference/ComposePreference.kt index 55a469c492f..91b2d8ac81a 100644 --- a/src/com/android/settings/spa/preference/ComposePreference.kt +++ b/src/com/android/settings/spa/preference/ComposePreference.kt @@ -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,