Android/packages_apps_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

2
src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java
View File

@@ -180,7 +180,7 @@ public class ConnectedDeviceGroupController extends BasePreferenceController
public void init(DashboardFragment fragment) {
final Context context = fragment.getContext();
DockUpdaterFeatureProvider dockUpdaterFeatureProvider =
FeatureFactory.getFactory(context).getDockUpdaterFeatureProvider();
FeatureFactory.getFeatureFactory().getDockUpdaterFeatureProvider();
final DockUpdater connectedDockUpdater =
dockUpdaterFeatureProvider.getConnectedDockUpdater(context, this);
init(hasBluetoothFeature()

4
src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java
View File

@@ -78,8 +78,8 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc
public PreviouslyConnectedDevicePreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
mSavedDockUpdater = FeatureFactory.getFactory(
context).getDockUpdaterFeatureProvider().getSavedDockUpdater(context, this);
mSavedDockUpdater = FeatureFactory.getFeatureFactory().getDockUpdaterFeatureProvider()
.getSavedDockUpdater(context, this);
mIntentFilter = new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED);
mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
}

2
src/com/android/settings/connecteddevice/SavedDeviceGroupController.java
View File

@@ -54,7 +54,7 @@ public class SavedDeviceGroupController extends BasePreferenceController
super(context, KEY);
DockUpdaterFeatureProvider dockUpdaterFeatureProvider =
FeatureFactory.getFactory(context).getDockUpdaterFeatureProvider();
FeatureFactory.getFeatureFactory().getDockUpdaterFeatureProvider();
mSavedDockUpdater =
dockUpdaterFeatureProvider.getSavedDockUpdater(context, this);
}

2
src/com/android/settings/connecteddevice/stylus/StylusDeviceUpdater.java
View File

@@ -71,7 +71,7 @@ public class StylusDeviceUpdater implements InputManager.InputDeviceListener,
mFragment = fragment;
mRegisteredBatteryCallbackIds = new ArrayList<>();
mDevicePreferenceCallback = devicePreferenceCallback;
mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
mContext = context;
mInputManager = context.getSystemService(InputManager.class);
}

8
src/com/android/settings/connecteddevice/stylus/StylusUsbFirmwareController.java
View File

@@ -85,8 +85,8 @@ public class StylusUsbFirmwareController extends BasePreferenceController
mPreferenceScreen.removePreference(mPreference);
}
if (hasUsbStylusFirmwareUpdateFeature(mStylusUsbDevice)) {
StylusFeatureProvider featureProvider = FeatureFactory.getFactory(
mContext).getStylusFeatureProvider();
StylusFeatureProvider featureProvider =
FeatureFactory.getFeatureFactory().getStylusFeatureProvider();
List<Preference> preferences =
featureProvider.getUsbFirmwareUpdatePreferences(mContext);
@@ -134,8 +134,8 @@ public class StylusUsbFirmwareController extends BasePreferenceController
static boolean hasUsbStylusFirmwareUpdateFeature(UsbDevice usbDevice) {
if (usbDevice == null) return false;
StylusFeatureProvider featureProvider = FeatureFactory.getFactory(
FeatureFactory.getAppContext()).getStylusFeatureProvider();
StylusFeatureProvider featureProvider =
FeatureFactory.getFeatureFactory().getStylusFeatureProvider();
return featureProvider.isUsbFirmwareUpdateEnabled(usbDevice);
}

3
src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java
View File

@@ -78,8 +78,7 @@ public class ConnectedUsbDeviceUpdater {
mUsbBackend = usbBackend;
mUsbReceiver = new UsbConnectionBroadcastReceiver(context,
mUsbConnectionListener, mUsbBackend);
mMetricsFeatureProvider = FeatureFactory.getFactory(mFragment.getContext())
.getMetricsFeatureProvider();
mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
}
public void registerCallback() {