Merge "Clean up Kotlin FeatureFactory.getFactory(context)" (55e64465) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/biometrics2/ui/view/FingerprintEnrollmentActivity.kt

+2 −4

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollIntroViewM
		import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollIntroViewModel.FingerprintEnrollIntroAction
		import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollProgressViewModel
		import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollmentViewModel
		import com.android.settings.overlay.FeatureFactory
		import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
		import com.google.android.setupdesign.util.ThemeHelper

		/**
		@@ -581,9 +581,7 @@ open class FingerprintEnrollmentActivity : FragmentActivity() {

		override val defaultViewModelCreationExtras: CreationExtras
		get() {
		val fingerprintRepository = FeatureFactory
		.getFactory(application)
		.biometricsRepositoryProvider
		val fingerprintRepository = featureFactory.biometricsRepositoryProvider
		.getFingerprintRepository(application)!!
		val credentialModel = CredentialModel(intent.extras, SystemClock.elapsedRealtimeClock())

src/com/android/settings/deviceinfo/hardwareinfo/ManufacturedYearPreferenceController.kt

+2 −3

Original line number	Diff line number	Diff line
		@@ -17,13 +17,12 @@ package com.android.settings.deviceinfo.hardwareinfo

		import android.content.Context
		import com.android.settings.core.BasePreferenceController
		import com.android.settings.overlay.FeatureFactory
		import com.android.settings.overlay.FeatureFactory.Companion.featureFactory

		/** Preference controller for Manufactured Year. */
		class ManufacturedYearPreferenceController(context: Context, preferenceKey: String) :
		BasePreferenceController(context, preferenceKey) {
		private val year: String? =
		FeatureFactory.getFactory(context).hardwareInfoFeatureProvider.manufacturedYear
		private val year: String? = featureFactory.hardwareInfoFeatureProvider.manufacturedYear

		override fun getAvailabilityStatus(): Int =
		if (!year.isNullOrEmpty()) AVAILABLE else UNSUPPORTED_ON_DEVICE

src/com/android/settings/overlay/FeatureFactory.kt

+5 −5

Original line number	Diff line number	Diff line
		@@ -152,7 +152,7 @@ abstract class FeatureFactory {

		/** Returns a factory for creating feature controllers. */
		@JvmStatic
		val factory: FeatureFactory
		val featureFactory: FeatureFactory
		get() = _factory ?: throw UnsupportedOperationException("No feature factory configured")

		private var _appContext: Context? = null
		@@ -171,13 +171,13 @@ abstract class FeatureFactory {

		/** Returns a factory for creating feature controllers. */
		@Deprecated(
		"Replace with factory without Context",
		"Replace with featureFactory without Context",
		ReplaceWith(
		"factory",
		"com.android.settings.overlay.FeatureFactory.Companion.factory",
		"featureFactory",
		"com.android.settings.overlay.FeatureFactory.Companion.featureFactory",
		)
		)
		@JvmStatic
		fun getFactory(context: Context?): FeatureFactory = factory
		fun getFactory(context: Context?): FeatureFactory = featureFactory
		}
		}

src/com/android/settings/spa/app/appinfo/AppCreateButton.kt

+3 −3

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.settings.spa.app.appinfo

		import android.app.settings.SettingsEnums
		import android.content.pm.ApplicationInfo
		import android.widget.Toast
		import androidx.compose.material.icons.Icons
		import androidx.compose.material.icons.outlined.Add
		import androidx.compose.runtime.Composable
		@@ -25,14 +26,13 @@ import androidx.compose.runtime.mutableStateOf
		import androidx.compose.runtime.rememberCoroutineScope
		import com.android.settings.R
		import com.android.settings.applications.manageapplications.CloneBackend
		import com.android.settings.overlay.FeatureFactory
		import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
		import com.android.settings.spa.app.appinfo.AppInfoSettingsProvider.getRoute
		import com.android.settingslib.spa.framework.compose.LocalNavController
		import com.android.settingslib.spa.widget.button.ActionButton
		import kotlinx.coroutines.Dispatchers
		import kotlinx.coroutines.launch
		import kotlinx.coroutines.withContext
		import android.widget.Toast;

		class AppCreateButton(packageInfoPresenter: PackageInfoPresenter) {
		private val context = packageInfoPresenter.context
		@@ -54,7 +54,7 @@ class AppCreateButton(packageInfoPresenter: PackageInfoPresenter) {
		)
		{
		val cloneBackend = CloneBackend.getInstance(context)
		FeatureFactory.getFactory(context).metricsFeatureProvider.action(context,
		featureFactory.metricsFeatureProvider.action(context,
		SettingsEnums.ACTION_CREATE_CLONE_APP)
		val appLabel = app.loadLabel(context.packageManager)
		Toast.makeText(context, context.getString(R.string.cloned_app_creation_toast_summary,

src/com/android/settings/spa/app/appinfo/AppDisableButton.kt

+2 −3

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ import androidx.compose.runtime.Composable
		import androidx.compose.ui.res.stringResource
		import com.android.settings.R
		import com.android.settings.Utils
		import com.android.settings.overlay.FeatureFactory
		import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
		import com.android.settingslib.spa.widget.button.ActionButton
		import com.android.settingslib.spa.widget.dialog.AlertDialogButton
		import com.android.settingslib.spa.widget.dialog.rememberAlertDialogPresenter
		@@ -43,8 +43,7 @@ class AppDisableButton(
		private val packageManager = context.packageManager
		private val userManager = context.userManager
		private val devicePolicyManager = context.devicePolicyManager
		private val applicationFeatureProvider =
		FeatureFactory.getFactory(context).getApplicationFeatureProvider(context)
		private val applicationFeatureProvider = featureFactory.getApplicationFeatureProvider(context)

		@Composable
		fun getActionButton(app: ApplicationInfo): ActionButton? {