diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 087c181ae6e..bc061e3b028 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -238,7 +238,7 @@ public class SettingsActivity extends SettingsBaseActivity String tag = getMetricsTag(); return new SharedPreferencesLogger(this, tag, - FeatureFactory.getFactory(this).getMetricsFeatureProvider(), + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(), lookupMetricsCategory()); } @@ -292,8 +292,8 @@ public class SettingsActivity extends SettingsBaseActivity protected void createUiFromIntent(Bundle savedState, Intent intent) { long startTime = System.currentTimeMillis(); - final FeatureFactory factory = FeatureFactory.getFactory(this); - mDashboardFeatureProvider = factory.getDashboardFeatureProvider(this); + final FeatureFactory factory = FeatureFactory.getFeatureFactory(); + mDashboardFeatureProvider = factory.getDashboardFeatureProvider(); if (intent.hasExtra(EXTRA_UI_OPTIONS)) { getWindow().setUiOptions(intent.getIntExtra(EXTRA_UI_OPTIONS, 0)); diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java index d4acfa11c57..9d673b134ca 100644 --- a/src/com/android/settings/dashboard/DashboardFragment.java +++ b/src/com/android/settings/dashboard/DashboardFragment.java @@ -94,8 +94,8 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment super.onAttach(context); mSuppressInjectedTileKeys = Arrays.asList(context.getResources().getStringArray( R.array.config_suppress_injected_tile_keys)); - mDashboardFeatureProvider = FeatureFactory.getFactory(context). - getDashboardFeatureProvider(context); + mDashboardFeatureProvider = + FeatureFactory.getFeatureFactory().getDashboardFeatureProvider(); // Load preference controllers from code final List controllersFromCode = createPreferenceControllers(context); diff --git a/src/com/android/settings/overlay/FeatureFactory.kt b/src/com/android/settings/overlay/FeatureFactory.kt index f38b5da7fed..5f456e0ebd7 100644 --- a/src/com/android/settings/overlay/FeatureFactory.kt +++ b/src/com/android/settings/overlay/FeatureFactory.kt @@ -81,7 +81,7 @@ abstract class FeatureFactory { */ abstract val batterySettingsFeatureProvider: BatterySettingsFeatureProvider - abstract fun getDashboardFeatureProvider(context: Context): DashboardFeatureProvider + abstract val dashboardFeatureProvider: DashboardFeatureProvider abstract val dockUpdaterFeatureProvider: DockUpdaterFeatureProvider abstract val applicationFeatureProvider: ApplicationFeatureProvider abstract val localeFeatureProvider: LocaleFeatureProvider diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.kt b/src/com/android/settings/overlay/FeatureFactoryImpl.kt index b6dd221572e..0da58717a27 100644 --- a/src/com/android/settings/overlay/FeatureFactoryImpl.kt +++ b/src/com/android/settings/overlay/FeatureFactoryImpl.kt @@ -67,8 +67,6 @@ import com.android.settingslib.spaprivileged.framework.common.devicePolicyManage * [FeatureFactory] implementation for AOSP Settings. */ open class FeatureFactoryImpl : FeatureFactory() { - private val dashboardFeatureProvider by lazy { DashboardFeatureProviderImpl(appContext) } - private val enterprisePrivacyFeatureProvider by lazy { EnterprisePrivacyFeatureProviderImpl( appContext, @@ -100,7 +98,7 @@ open class FeatureFactoryImpl : FeatureFactory() { override val batterySettingsFeatureProvider by lazy { BatterySettingsFeatureProviderImpl() } - override fun getDashboardFeatureProvider(context: Context) = dashboardFeatureProvider + override val dashboardFeatureProvider by lazy { DashboardFeatureProviderImpl(appContext) } override val dockUpdaterFeatureProvider: DockUpdaterFeatureProvider by lazy { DockUpdaterFeatureProviderImpl() diff --git a/src/com/android/settings/search/SettingsSearchIndexablesProvider.java b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java index d6635a197c2..3b10c0971f6 100644 --- a/src/com/android/settings/search/SettingsSearchIndexablesProvider.java +++ b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java @@ -173,7 +173,7 @@ public class SettingsSearchIndexablesProvider extends SearchIndexablesProvider { public Cursor queryDynamicRawData(String[] projection) { final Context context = getContext(); final List rawList = new ArrayList<>(); - final Collection bundles = FeatureFactory.getFactory(context) + final Collection bundles = FeatureFactory.getFeatureFactory() .getSearchFeatureProvider().getSearchIndexableResources().getProviderValues(); for (SearchIndexableData bundle : bundles) { @@ -200,8 +200,8 @@ public class SettingsSearchIndexablesProvider extends SearchIndexablesProvider { final MatrixCursor cursor = new MatrixCursor(SITE_MAP_COLUMNS); final Context context = getContext(); // Loop through all IA categories and pages and build additional SiteMapPairs - final List categories = FeatureFactory.getFactory(context) - .getDashboardFeatureProvider(context).getAllCategories(); + final List categories = FeatureFactory.getFeatureFactory() + .getDashboardFeatureProvider().getAllCategories(); for (DashboardCategory category : categories) { // Use the category key to look up parent (which page hosts this key) final String parentClass = CATEGORY_KEY_TO_PARENT_MAP.get(category.key); @@ -271,7 +271,7 @@ public class SettingsSearchIndexablesProvider extends SearchIndexablesProvider { } private List getNonIndexableKeysFromProvider(Context context) { - final Collection bundles = FeatureFactory.getFactory(context) + final Collection bundles = FeatureFactory.getFeatureFactory() .getSearchFeatureProvider().getSearchIndexableResources().getProviderValues(); final List nonIndexableKeys = new ArrayList<>(); @@ -322,7 +322,7 @@ public class SettingsSearchIndexablesProvider extends SearchIndexablesProvider { } private List getSearchIndexableResourcesFromProvider(Context context) { - final Collection bundles = FeatureFactory.getFactory(context) + final Collection bundles = FeatureFactory.getFeatureFactory() .getSearchFeatureProvider().getSearchIndexableResources().getProviderValues(); List resourceList = new ArrayList<>(); @@ -348,7 +348,7 @@ public class SettingsSearchIndexablesProvider extends SearchIndexablesProvider { } private List getSearchIndexableRawFromProvider(Context context) { - final Collection bundles = FeatureFactory.getFactory(context) + final Collection bundles = FeatureFactory.getFeatureFactory() .getSearchFeatureProvider().getSearchIndexableResources().getProviderValues(); final List rawList = new ArrayList<>(); @@ -392,7 +392,7 @@ public class SettingsSearchIndexablesProvider extends SearchIndexablesProvider { @VisibleForTesting List getInjectionIndexableRawData(Context context) { final DashboardFeatureProvider dashboardFeatureProvider = - FeatureFactory.getFactory(context).getDashboardFeatureProvider(context); + FeatureFactory.getFeatureFactory().getDashboardFeatureProvider(); final List rawList = new ArrayList<>(); final String currentPackageName = context.getPackageName(); for (DashboardCategory category : dashboardFeatureProvider.getAllCategories()) { diff --git a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java index 90985dd6699..cd9b08190ed 100644 --- a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java +++ b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java @@ -171,8 +171,9 @@ public class FakeFeatureFactory extends FeatureFactory { return powerUsageFeatureProvider; } + @NotNull @Override - public DashboardFeatureProvider getDashboardFeatureProvider(Context context) { + public DashboardFeatureProvider getDashboardFeatureProvider() { return dashboardFeatureProvider; } diff --git a/tests/spa_unit/src/com/android/settings/testutils/FakeFeatureFactory.kt b/tests/spa_unit/src/com/android/settings/testutils/FakeFeatureFactory.kt index 54934a7be27..0fe634ab3d9 100644 --- a/tests/spa_unit/src/com/android/settings/testutils/FakeFeatureFactory.kt +++ b/tests/spa_unit/src/com/android/settings/testutils/FakeFeatureFactory.kt @@ -77,9 +77,8 @@ class FakeFeatureFactory : FeatureFactory() { override val batterySettingsFeatureProvider: BatterySettingsFeatureProvider get() = TODO("Not yet implemented") - override fun getDashboardFeatureProvider(context: Context): DashboardFeatureProvider { - TODO("Not yet implemented") - } + override val dashboardFeatureProvider: DashboardFeatureProvider + get() = TODO("Not yet implemented") override val dockUpdaterFeatureProvider: DockUpdaterFeatureProvider get() = TODO("Not yet implemented") diff --git a/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java index 79804e3b990..0c3bc8c4444 100644 --- a/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java +++ b/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java @@ -170,8 +170,9 @@ public class FakeFeatureFactory extends FeatureFactory { return powerUsageFeatureProvider; } + @NotNull @Override - public DashboardFeatureProvider getDashboardFeatureProvider(Context context) { + public DashboardFeatureProvider getDashboardFeatureProvider() { return dashboardFeatureProvider; }