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

Clean up FeatureFactory.getFeature()

Browse Source 
Bug: 286764889
Test: m Settings
Change-Id: I7e472e6b0ca6b7a735c1b92742ddf06c545176fc
This commit is contained in:
Chaohui Wang
2023-08-04 15:42:43 +08:00
parent 0062308347
commit 8e2ae547d6
220 changed files with 282 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/slices/SettingsSliceProvider.java
View File

@@ -164,7 +164,7 @@ public class SettingsSliceProvider extends SliceProvider {
Log.d(TAG, "onSlicePinned: " + sliceUri);
mFirstSlicePinned = true;
}
FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider()
FeatureFactory.getFeatureFactory().getMetricsFeatureProvider()
.action(SettingsEnums.PAGE_UNKNOWN,
SettingsEnums.ACTION_SETTINGS_SLICE_REQUESTED,
SettingsEnums.PAGE_UNKNOWN,
@@ -173,7 +173,7 @@ public class SettingsSliceProvider extends SliceProvider {
if (CustomSliceRegistry.isValidUri(sliceUri)) {
final Context context = getContext();
final CustomSliceable sliceable = FeatureFactory.getFactory(context)
final CustomSliceable sliceable = FeatureFactory.getFeatureFactory()
.getSlicesFeatureProvider().getSliceableFromUri(context, sliceUri);
final IntentFilter filter = sliceable.getIntentFilter();
if (filter != null) {
@@ -246,13 +246,13 @@ public class SettingsSliceProvider extends SliceProvider {
// from the Settings team.
if (CustomSliceRegistry.isValidUri(sliceUri)) {
final Context context = getContext();
return FeatureFactory.getFactory(context)
return FeatureFactory.getFeatureFactory()
.getSlicesFeatureProvider().getSliceableFromUri(context, sliceUri)
.getSlice();
}
if (CustomSliceRegistry.WIFI_CALLING_URI.equals(sliceUri)) {
return FeatureFactory.getFactory(getContext())
return FeatureFactory.getFeatureFactory()
.getSlicesFeatureProvider()
.getNewWifiCallingSliceHelper(getContext())
.createWifiCallingSlice(sliceUri);
@@ -261,12 +261,12 @@ public class SettingsSliceProvider extends SliceProvider {
} else if (CustomSliceRegistry.BLUETOOTH_URI.equals(sliceUri)) {
return BluetoothSliceBuilder.getSlice(getContext());
} else if (CustomSliceRegistry.ENHANCED_4G_SLICE_URI.equals(sliceUri)) {
return FeatureFactory.getFactory(getContext())
return FeatureFactory.getFeatureFactory()
.getSlicesFeatureProvider()
.getNewEnhanced4gLteSliceHelper(getContext())
.createEnhanced4gLteSlice(sliceUri);
} else if (CustomSliceRegistry.WIFI_CALLING_PREFERENCE_URI.equals(sliceUri)) {
return FeatureFactory.getFactory(getContext())
return FeatureFactory.getFeatureFactory()
.getSlicesFeatureProvider()
.getNewWifiCallingSliceHelper(getContext())
.createWifiCallingPreferenceSlice(sliceUri);

8
src/com/android/settings/slices/SliceBroadcastReceiver.java
View File

@@ -77,7 +77,7 @@ public class SliceBroadcastReceiver extends BroadcastReceiver {
BluetoothSliceBuilder.handleUriChange(context, intent);
break;
case ACTION_WIFI_CALLING_CHANGED:
FeatureFactory.getFactory(context)
FeatureFactory.getFeatureFactory()
.getSlicesFeatureProvider()
.getNewWifiCallingSliceHelper(context)
.handleWifiCallingChanged(intent);
@@ -86,7 +86,7 @@ public class SliceBroadcastReceiver extends BroadcastReceiver {
ZenModeSliceBuilder.handleUriChange(context, intent);
break;
case ACTION_ENHANCED_4G_LTE_CHANGED:
FeatureFactory.getFactory(context)
FeatureFactory.getFeatureFactory()
.getSlicesFeatureProvider()
.getNewEnhanced4gLteSliceHelper(context)
.handleEnhanced4gLteChanged(intent);
@@ -94,7 +94,7 @@ public class SliceBroadcastReceiver extends BroadcastReceiver {
case ACTION_WIFI_CALLING_PREFERENCE_WIFI_ONLY:
case ACTION_WIFI_CALLING_PREFERENCE_WIFI_PREFERRED:
case ACTION_WIFI_CALLING_PREFERENCE_CELLULAR_PREFERRED:
FeatureFactory.getFactory(context)
FeatureFactory.getFeatureFactory()
.getSlicesFeatureProvider()
.getNewWifiCallingSliceHelper(context)
.handleWifiCallingPreferenceChanged(intent);
@@ -172,7 +172,7 @@ public class SliceBroadcastReceiver extends BroadcastReceiver {
* follows the pattern in SharedPreferenceLogger.
*/
private void logSliceValueChange(Context context, String sliceKey, int newValue) {
FeatureFactory.getFactory(context).getMetricsFeatureProvider()
FeatureFactory.getFeatureFactory().getMetricsFeatureProvider()
.action(SettingsEnums.PAGE_UNKNOWN,
SettingsEnums.ACTION_SETTINGS_SLICE_CHANGED,
SettingsEnums.PAGE_UNKNOWN,

4
src/com/android/settings/slices/SliceDataConverter.java
View File

@@ -84,7 +84,7 @@ class SliceDataConverter {
public SliceDataConverter(Context context) {
mContext = context;
mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
}
/**
@@ -100,7 +100,7 @@ class SliceDataConverter {
public List<SliceData> getSliceData() {
List<SliceData> sliceData = new ArrayList<>();
final Collection<SearchIndexableData> bundles = FeatureFactory.getFactory(mContext)
final Collection<SearchIndexableData> bundles = FeatureFactory.getFeatureFactory()
.getSearchFeatureProvider().getSearchIndexableResources().getProviderValues();
for (SearchIndexableData bundle : bundles) {

3
src/com/android/settings/slices/SlicesDatabaseAccessor.java
View File

@@ -194,8 +194,7 @@ public class SlicesDatabaseAccessor {
private void verifyIndexing() {
final long uidToken = Binder.clearCallingIdentity();
try {
FeatureFactory.getFactory(
mContext).getSlicesFeatureProvider().indexSliceData(mContext);
FeatureFactory.getFeatureFactory().getSlicesFeatureProvider().indexSliceData(mContext);
} finally {
Binder.restoreCallingIdentity(uidToken);
}

2
src/com/android/settings/slices/SlicesIndexer.java
View File

@@ -88,7 +88,7 @@ class SlicesIndexer implements Runnable {
@VisibleForTesting
List<SliceData> getSliceData() {
return FeatureFactory.getFactory(mContext)
return FeatureFactory.getFeatureFactory()
.getSlicesFeatureProvider()
.getSliceDataConverter(mContext)
.getSliceData();