Merge "Add Category for TogglePermissionAppInfoPage" into main (af3ac7f2) · Commits · e / os / android_frameworks_base

packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/TogglePermissionAppInfoPage.kt

+10 −7

Original line number	Diff line number	Diff line
		@@ -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) }
		}
		Category {
		RestrictedSwitchPreference(
		model = switchModel,
		restrictions = getRestrictions(userId, packageName, isAllowed()),
		ifBlockedByAdminOverrideCheckedValueTo = switchifBlockedByAdminOverrideCheckedValueTo,
		ifBlockedByAdminOverrideCheckedValueTo =
		switchifBlockedByAdminOverrideCheckedValueTo,
		restrictionsProviderFactory = restrictionsProviderFactory,
		)
		InfoPageAdditionalContent(record, isAllowed)
		}
		}
		}

+0 −3

Original line number	Diff line number	Diff line
		@@ -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?) {}
		}

		/**