From a407bb627b3bfab739ecf1cb8f2182ee9ca81c7c Mon Sep 17 00:00:00 2001
From: Chaohui Wang <chaohuiw@google.com>
Date: Mon, 18 Nov 2024 11:48:55 +0800
Subject: [PATCH] Mark ComposePreference as NormalPaddingMixin

Bug: 366336385
Flag: EXEMPT bug fix
Test: manual
Change-Id: I4094c1b040e3427aa28edddc15fd0e8746ff2a80
---
 .../settings/spa/preference/ComposePreference.kt      | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/spa/preference/ComposePreference.kt b/src/com/android/settings/spa/preference/ComposePreference.kt
index 57aa3866390..81d2b4bceb9 100644
--- a/src/com/android/settings/spa/preference/ComposePreference.kt
+++ b/src/com/android/settings/spa/preference/ComposePreference.kt
@@ -27,20 +27,25 @@ import androidx.preference.PreferenceViewHolder
 import com.android.settings.R
 import com.android.settingslib.spa.framework.theme.SettingsTheme
 import com.android.settingslib.widget.GroupSectionDividerMixin
+import com.android.settingslib.widget.NormalPaddingMixin
 
-open class ComposeGroupSectionPreference @JvmOverloads constructor(
+open class ComposeGroupSectionPreference
+@JvmOverloads
+constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0,
     defStyleRes: Int = 0,
 ) : ComposePreference(context, attrs, defStyleAttr, defStyleRes), GroupSectionDividerMixin
 
-open class ComposePreference @JvmOverloads constructor(
+open class ComposePreference
+@JvmOverloads
+constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0,
     defStyleRes: Int = 0,
-) : Preference(context, attrs, defStyleAttr, defStyleRes) {
+) : Preference(context, attrs, defStyleAttr, defStyleRes), NormalPaddingMixin {
     private var content: @Composable () -> Unit = {}
 
     fun setContent(content: @Composable () -> Unit) {