Merge "Add Category for TogglePermissionAppInfoPage" into main

2 files changed, 10 insertions, 10 deletions

diff --git a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/TogglePermissionAppInfoPage.kt b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/TogglePermissionAppInfoPage.kt
index 5580d2e3211b..6dd5e371d8a6 100644
--- a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/TogglePermissionAppInfoPage.kt
+++ b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/TogglePermissionAppInfoPage.kt
@@ -37,6 +37,7 @@ import com.android.settingslib.spa.widget.preference.Preference
 import com.android.settingslib.spa.widget.preference.PreferenceModel
 import com.android.settingslib.spa.widget.preference.SwitchPreferenceModel
 import com.android.settingslib.spa.widget.ui.AnnotatedText
+import com.android.settingslib.spa.widget.ui.Category
 import com.android.settingslib.spaprivileged.model.app.AppRecord
 import com.android.settingslib.spaprivileged.model.app.IPackageManagers
 import com.android.settingslib.spaprivileged.model.app.PackageManagers
@@ -153,13 +154,15 @@ internal fun <T : AppRecord> TogglePermissionAppListModel<T>.TogglePermissionApp
             override val changeable = { isChangeable }
             override val onCheckedChange: (Boolean) -> Unit = { setAllowed(record, it) }
         }
-        RestrictedSwitchPreference(
-            model = switchModel,
-            restrictions = getRestrictions(userId, packageName, isAllowed()),
-            ifBlockedByAdminOverrideCheckedValueTo = switchifBlockedByAdminOverrideCheckedValueTo,
-            restrictionsProviderFactory = restrictionsProviderFactory,
-        )
-        InfoPageAdditionalContent(record, isAllowed)
+        Category {
+            RestrictedSwitchPreference(
+                model = switchModel,
+                restrictions = getRestrictions(userId, packageName, isAllowed()),
+                ifBlockedByAdminOverrideCheckedValueTo =
+                    switchifBlockedByAdminOverrideCheckedValueTo,
+                restrictionsProviderFactory = restrictionsProviderFactory,
+            )
+        }
     }
 }
 
diff --git a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/TogglePermissionAppList.kt b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/TogglePermissionAppList.kt
index 771eb85ee21a..a3e4aa0420ff 100644
--- a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/TogglePermissionAppList.kt
+++ b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/TogglePermissionAppList.kt
@@ -91,9 +91,6 @@ interface TogglePermissionAppListModel<T : AppRecord> {
      * Sets whether the permission is allowed for the given app.
      */
     fun setAllowed(record: T, newAllowed: Boolean)
-
-    @Composable
-    fun InfoPageAdditionalContent(record: T, isAllowed: () -> Boolean?) {}
 }
 
 /**