Merge "Add permission screens to DeviceStateConfig" into main (a6436cad) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/appfunctions/DeviceStateConfig.kt

+37 −0

Original line number	Diff line number	Diff line
		@@ -47,8 +47,14 @@ import com.android.settings.notification.modes.devicestate.ZenModeDndDisplayScre
		import com.android.settings.notification.modes.devicestate.ZenModeDndScreen
		import com.android.settings.security.LockScreenPreferenceScreen
		import com.android.settings.spa.app.catalyst.AllAppsScreen
		import com.android.settings.spa.app.catalyst.AppInfoAllFilesAccessScreen
		import com.android.settings.spa.app.catalyst.AppInfoDisplayOverOtherAppsScreen
		import com.android.settings.spa.app.catalyst.AppInfoFullScreenIntentScreen
		import com.android.settings.spa.app.catalyst.AppInfoStorageScreen
		import com.android.settings.spa.app.catalyst.AppStorageAppListScreen
		import com.android.settings.spa.app.catalyst.AppsAllFilesAccessAppListScreen
		import com.android.settings.spa.app.catalyst.AppsDisplayOverOtherAppsAppListScreen
		import com.android.settings.spa.app.catalyst.AppsFullScreenIntentAppListScreen
		import com.android.settings.supervision.SupervisionDashboardScreen
		import com.android.settings.supervision.SupervisionPinManagementScreen
		import com.android.settingslib.metadata.PreferenceMetadata
		@@ -129,6 +135,21 @@ fun getScreenConfigs() =
		screenKey = LocationScreen.KEY,
		category = setOf(DeviceStateCategory.PERMISSION),
		),
		PerScreenConfig(
		enabled = true,
		screenKey = AppsAllFilesAccessAppListScreen.KEY,
		category = setOf(DeviceStateCategory.PERMISSION),
		),
		PerScreenConfig(
		enabled = true,
		screenKey = AppsDisplayOverOtherAppsAppListScreen.KEY,
		category = setOf(DeviceStateCategory.PERMISSION),
		),
		PerScreenConfig(
		enabled = true,
		screenKey = AppsFullScreenIntentAppListScreen.KEY,
		category = setOf(DeviceStateCategory.PERMISSION),
		),
		PerScreenConfig(
		enabled = true,
		screenKey = MobileNetworkListScreen.KEY,
		@@ -525,6 +546,22 @@ fun getDeviceStateItemList() =
		metadata.extras(context)?.getString(AppInfoStorageScreen.KEY_EXTRA_PACKAGE_NAME)
		},
		),
		// AppList summaries for each permission types
		DeviceStateItemConfig(
		enabled = true,
		settingKey = AppInfoAllFilesAccessScreen.KEY,
		settingScreenKey = AppsAllFilesAccessAppListScreen.KEY,
		),
		DeviceStateItemConfig(
		enabled = true,
		settingKey = AppInfoDisplayOverOtherAppsScreen.KEY,
		settingScreenKey = AppsDisplayOverOtherAppsAppListScreen.KEY,
		),
		DeviceStateItemConfig(
		enabled = true,
		settingKey = AppInfoFullScreenIntentScreen.KEY,
		settingScreenKey = AppsFullScreenIntentAppListScreen.KEY,
		),
		DeviceStateItemConfig(
		enabled = true,
		settingKey = StoragePreferenceScreen.KEY_SUMMARY_USED,

src/com/android/settings/spa/app/catalyst/AppInfoAllFilesAccessScreen.kt

+0 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ import com.android.settings.applications.AppStateManageExternalStorageBridge
		import com.android.settings.contract.TAG_DEVICE_STATE_PREFERENCE
		import com.android.settings.contract.TAG_DEVICE_STATE_SCREEN
		import com.android.settings.flags.Flags
		import com.android.settings.utils.highlightPreference
		import com.android.settingslib.applications.ApplicationsState
		import com.android.settingslib.datastore.KeyValueStore
		import com.android.settingslib.datastore.NoOpKeyedObservable

src/com/android/settings/spa/app/catalyst/AppInfoDisplayOverOtherAppsScreen.kt

+0 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ import com.android.settings.applications.AppStateOverlayBridge
		import com.android.settings.contract.TAG_DEVICE_STATE_PREFERENCE
		import com.android.settings.contract.TAG_DEVICE_STATE_SCREEN
		import com.android.settings.flags.Flags
		import com.android.settings.utils.highlightPreference
		import com.android.settingslib.applications.ApplicationsState
		import com.android.settingslib.datastore.KeyValueStore
		import com.android.settingslib.datastore.NoOpKeyedObservable

src/com/android/settings/spa/app/catalyst/AppInfoFullScreenIntentScreen.kt

+0 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@ import com.android.settings.R
		import com.android.settings.contract.TAG_DEVICE_STATE_PREFERENCE
		import com.android.settings.contract.TAG_DEVICE_STATE_SCREEN
		import com.android.settings.flags.Flags
		import com.android.settings.utils.highlightPreference
		import com.android.settingslib.datastore.KeyValueStore
		import com.android.settingslib.datastore.NoOpKeyedObservable
		import com.android.settingslib.metadata.BooleanValuePreference