Merge "[Catalyst] Use PreferenceScreenMixin for screens" into main (27e27c5f) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/deviceinfo/storage/StoragePreferenceScreen.kt

+12 −7

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.settings.deviceinfo.storage

		import android.app.settings.SettingsEnums
		import android.app.usage.StorageStatsManager
		import android.content.Context
		import android.content.Intent
		@@ -26,6 +27,8 @@ import android.util.DataUnit
		import android.util.SparseArray
		import androidx.core.net.toUri
		import com.android.settings.R
		import com.android.settings.core.PreferenceScreenMixin
		import com.android.settings.deviceinfo.StorageDashboardFragment
		import com.android.settings.flags.Flags
		import com.android.settingslib.applications.StorageStatsSource
		import com.android.settingslib.deviceinfo.PrivateStorageInfo
		@@ -33,23 +36,25 @@ import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider
		import com.android.settingslib.metadata.PreferenceHierarchy
		import com.android.settingslib.metadata.PreferenceHierarchyGenerator
		import com.android.settingslib.metadata.PreferenceMetadata
		import com.android.settingslib.metadata.PreferenceTitleProvider
		import com.android.settingslib.metadata.ProvidePreferenceScreen
		import com.android.settingslib.metadata.asyncPreferenceHierarchy
		import com.android.settingslib.metadata.preferenceHierarchy
		import com.android.settingslib.preference.PreferenceFragment
		import com.android.settingslib.preference.PreferenceScreenCreator

		@ProvidePreferenceScreen(StoragePreferenceScreen.KEY)
		class StoragePreferenceScreen(
		private val context: Context
		) : PreferenceScreenCreator, PreferenceHierarchyGenerator<Int> {
		open class StoragePreferenceScreen(private val context: Context) :
		PreferenceScreenMixin, PreferenceHierarchyGenerator<Int> {

		override val key: String
		get() = KEY

		override val title: Int
		get() = R.string.storage_settings

		override val highlightMenuKey: Int
		get() = R.string.menu_key_storage

		override fun getMetricsCategory() = SettingsEnums.SETTINGS_STORAGE_CATEGORY

		override fun getLaunchIntent(
		context: Context,
		metadata: PreferenceMetadata?
		@@ -256,7 +261,7 @@ class StoragePreferenceScreen(
		override val defaultType: Int
		get() = context.userId

		override fun fragmentClass() = PreferenceFragment::class.java
		override fun fragmentClass() = StorageDashboardFragment::class.java

		private fun getStorageCache(context: Context, userId: Int): StorageCacheHelper.StorageCache {
		val cacheHelper = StorageCacheHelper(context, userId)

src/com/android/settings/location/LocationScreen.kt

+10 −2

Original line number	Diff line number	Diff line
		@@ -15,10 +15,12 @@
		*/
		package com.android.settings.location

		import android.app.settings.SettingsEnums
		import android.content.Context
		import android.content.Intent
		import android.location.LocationManager
		import com.android.settings.R
		import com.android.settings.core.PreferenceScreenMixin
		import com.android.settings.flags.Flags
		import com.android.settingslib.datastore.KeyValueStore
		import com.android.settingslib.datastore.NoOpKeyedObservable
		@@ -30,12 +32,13 @@ import com.android.settingslib.metadata.ProvidePreferenceScreen
		import com.android.settingslib.metadata.ReadWritePermit
		import com.android.settingslib.metadata.SensitivityLevel
		import com.android.settingslib.metadata.preferenceHierarchy
		import com.android.settingslib.preference.PreferenceScreenCreator
		import com.android.settingslib.widget.MainSwitchPreferenceBinding
		import com.android.settingslib.widget.SettingsThemeHelper.isExpressiveTheme

		@ProvidePreferenceScreen(LocationScreen.KEY)
		class LocationScreen : PreferenceScreenCreator, PreferenceSummaryProvider, PreferenceIconProvider {
		open class LocationScreen :
		PreferenceScreenMixin, PreferenceSummaryProvider, PreferenceIconProvider {

		override val key: String
		get() = KEY

		@@ -45,6 +48,11 @@ class LocationScreen : PreferenceScreenCreator, PreferenceSummaryProvider, Prefe
		override val keywords: Int
		get() = R.string.keywords_location

		override val highlightMenuKey: Int
		get() = R.string.menu_key_location

		override fun getMetricsCategory() = SettingsEnums.LOCATION

		override fun getLaunchIntent(context: Context, metadata: PreferenceMetadata?): Intent? {
		return Intent(android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS)
		}

src/com/android/settings/location/RecentLocationAccessScreen.kt

+8 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@
		package com.android.settings.location

		import android.Manifest
		import android.app.settings.SettingsEnums
		import android.content.Context
		import android.content.Intent
		import android.icu.text.RelativeDateTimeFormatter
		@@ -24,6 +25,7 @@ import android.os.UserManager
		import android.provider.Settings
		import com.android.settings.R
		import com.android.settings.contract.TAG_DEVICE_STATE_SCREEN
		import com.android.settings.core.PreferenceScreenMixin
		import com.android.settings.dashboard.profileselector.ProfileSelectFragment
		import com.android.settings.flags.Flags
		import com.android.settingslib.applications.RecentAppOpsAccess
		@@ -37,7 +39,7 @@ import com.android.settingslib.preference.PreferenceScreenCreator
		import com.android.settingslib.utils.StringUtil

		@ProvidePreferenceScreen(RecentLocationAccessScreen.KEY)
		class RecentLocationAccessScreen: PreferenceScreenCreator, PreferenceAvailabilityProvider {
		open class RecentLocationAccessScreen: PreferenceScreenMixin, PreferenceAvailabilityProvider {

		override val key: String
		get() = KEY
		@@ -45,6 +47,11 @@ class RecentLocationAccessScreen: PreferenceScreenCreator, PreferenceAvailabilit
		override val title: Int
		get() = R.string.location_category_recent_location_access

		override val highlightMenuKey: Int
		get() = R.string.menu_key_location

		override fun getMetricsCategory() = SettingsEnums.LOCATION_RECENT_ACCESS_ALL

		override fun tags(context: Context) = arrayOf(TAG_DEVICE_STATE_SCREEN)

		override fun isFlagEnabled(context: Context) =