PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove context from dashboardFeatureProvider" into main

Browse Source
This commit is contained in:
Chaohui Wang
2023-07-25 23:39:27 +00:00
committed by Android (Google) Code Review
parent 4b882659bc 58f0ee30fc
commit a7a10f1088
8 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/SettingsActivity.java
View File

@@ -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));

4
src/com/android/settings/dashboard/DashboardFragment.java
View File

@@ -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<AbstractPreferenceController> controllersFromCode =
createPreferenceControllers(context);

2
src/com/android/settings/overlay/FeatureFactory.kt
View File

@@ -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

4
src/com/android/settings/overlay/FeatureFactoryImpl.kt
View File

@@ -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()

14
src/com/android/settings/search/SettingsSearchIndexablesProvider.java
View File

@@ -173,7 +173,7 @@ public class SettingsSearchIndexablesProvider extends SearchIndexablesProvider {
public Cursor queryDynamicRawData(String[] projection) {
final Context context = getContext();
final List<SearchIndexableRaw> rawList = new ArrayList<>();
final Collection<SearchIndexableData> bundles = FeatureFactory.getFactory(context)
final Collection<SearchIndexableData> 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<DashboardCategory> categories = FeatureFactory.getFactory(context)
.getDashboardFeatureProvider(context).getAllCategories();
final List<DashboardCategory> 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<String> getNonIndexableKeysFromProvider(Context context) {
final Collection<SearchIndexableData> bundles = FeatureFactory.getFactory(context)
final Collection<SearchIndexableData> bundles = FeatureFactory.getFeatureFactory()
.getSearchFeatureProvider().getSearchIndexableResources().getProviderValues();
final List<String> nonIndexableKeys = new ArrayList<>();
@@ -322,7 +322,7 @@ public class SettingsSearchIndexablesProvider extends SearchIndexablesProvider {
}
private List<SearchIndexableResource> getSearchIndexableResourcesFromProvider(Context context) {
final Collection<SearchIndexableData> bundles = FeatureFactory.getFactory(context)
final Collection<SearchIndexableData> bundles = FeatureFactory.getFeatureFactory()
.getSearchFeatureProvider().getSearchIndexableResources().getProviderValues();
List<SearchIndexableResource> resourceList = new ArrayList<>();
@@ -348,7 +348,7 @@ public class SettingsSearchIndexablesProvider extends SearchIndexablesProvider {
}
private List<SearchIndexableRaw> getSearchIndexableRawFromProvider(Context context) {
final Collection<SearchIndexableData> bundles = FeatureFactory.getFactory(context)
final Collection<SearchIndexableData> bundles = FeatureFactory.getFeatureFactory()
.getSearchFeatureProvider().getSearchIndexableResources().getProviderValues();
final List<SearchIndexableRaw> rawList = new ArrayList<>();
@@ -392,7 +392,7 @@ public class SettingsSearchIndexablesProvider extends SearchIndexablesProvider {
@VisibleForTesting
List<SearchIndexableRaw> getInjectionIndexableRawData(Context context) {
final DashboardFeatureProvider dashboardFeatureProvider =
FeatureFactory.getFactory(context).getDashboardFeatureProvider(context);
FeatureFactory.getFeatureFactory().getDashboardFeatureProvider();
final List<SearchIndexableRaw> rawList = new ArrayList<>();
final String currentPackageName = context.getPackageName();
for (DashboardCategory category : dashboardFeatureProvider.getAllCategories()) {

3
tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
View File

@@ -171,8 +171,9 @@ public class FakeFeatureFactory extends FeatureFactory {
return powerUsageFeatureProvider;
}
@NotNull
@Override
public DashboardFeatureProvider getDashboardFeatureProvider(Context context) {
public DashboardFeatureProvider getDashboardFeatureProvider() {
return dashboardFeatureProvider;
}

5
tests/spa_unit/src/com/android/settings/testutils/FakeFeatureFactory.kt
View File

@@ -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")

3
tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java
View File

@@ -170,8 +170,9 @@ public class FakeFeatureFactory extends FeatureFactory {
return powerUsageFeatureProvider;
}
@NotNull
@Override
public DashboardFeatureProvider getDashboardFeatureProvider(Context context) {
public DashboardFeatureProvider getDashboardFeatureProvider() {
return dashboardFeatureProvider;
}