From 8e2ae547d6b837724f66071beb0b09c8ee6eacc3 Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Fri, 4 Aug 2023 15:42:43 +0800 Subject: [PATCH] Clean up FeatureFactory.getFeature() Bug: 286764889 Test: m Settings Change-Id: I7e472e6b0ca6b7a735c1b92742ddf06c545176fc --- src/com/android/settings/AirplaneModeEnabler.java | 2 +- src/com/android/settings/BugreportPreference.java | 4 ++-- .../AccessibilityDetailsSettingsFragment.java | 2 +- .../accessibility/AccessibilitySettings.java | 2 +- .../CameraFlashNotificationPreferenceController.java | 2 +- .../accessibility/RestrictedPreferenceHelper.java | 4 ++-- .../ScreenFlashNotificationPreferenceController.java | 2 +- .../accounts/AccountPreferenceController.java | 2 +- .../android/settings/accounts/AvatarViewMixin.java | 6 +++--- .../accounts/RemoveAccountPreferenceController.java | 2 +- .../ActivityEmbeddingRulesController.java | 2 +- .../settings/applications/UsageAccessDetails.java | 2 +- .../appinfo/AppSettingPreferenceController.java | 2 +- .../applications/appinfo/DrawOverlayDetails.java | 2 +- .../appinfo/InstantAppButtonDialogFragment.java | 2 +- .../appinfo/ManageExternalStorageDetails.java | 2 +- .../applications/appinfo/WriteSettingsDetails.java | 2 +- .../manageapplications/ApplicationViewHolder.java | 2 +- .../specialaccess/deviceadmin/DeviceAdminAdd.java | 2 +- .../DeviceAdminListPreferenceController.java | 2 +- .../ApprovalPreferenceController.java | 2 +- .../pictureinpicture/PictureInPictureDetails.java | 2 +- .../specialaccess/premiumsms/PremiumSmsAccess.java | 2 +- .../specialaccess/vrlistener/VrListenerSettings.java | 2 +- .../specialaccess/zenaccess/ZenAccessController.java | 3 +-- .../settings/biometrics/BiometricEnrollActivity.java | 2 +- .../settings/biometrics/BiometricEnrollBase.java | 2 +- .../BiometricStatusPreferenceController.java | 2 +- .../android/settings/biometrics/BiometricUtils.java | 2 +- .../settings/biometrics/face/FaceSettings.java | 12 ++++-------- .../face/FaceSettingsFooterPreferenceController.java | 2 +- ...FaceSettingsRemoveButtonPreferenceController.java | 2 +- .../factory/BiometricsViewModelFactory.java | 6 +++--- .../BluetoothDetailsCompanionAppsController.java | 2 +- .../bluetooth/BluetoothDetailsController.java | 2 +- .../BluetoothDetailsRelatedToolsController.java | 4 ++-- .../bluetooth/BluetoothDeviceDetailsFragment.java | 8 ++++---- .../bluetooth/BluetoothDevicePairingDetailBase.java | 4 ++-- .../bluetooth/BluetoothDevicePreference.java | 2 +- .../BluetoothDeviceRenamePreferenceController.java | 2 +- .../settings/bluetooth/BluetoothDeviceUpdater.java | 2 +- .../BluetoothSwitchPreferenceController.java | 2 +- src/com/android/settings/bluetooth/Utils.java | 2 +- .../ConnectedDeviceGroupController.java | 2 +- ...reviouslyConnectedDevicePreferenceController.java | 4 ++-- .../connecteddevice/SavedDeviceGroupController.java | 2 +- .../connecteddevice/stylus/StylusDeviceUpdater.java | 2 +- .../stylus/StylusUsbFirmwareController.java | 8 ++++---- .../usb/ConnectedUsbDeviceUpdater.java | 3 +-- .../android/settings/core/InstrumentedActivity.java | 2 +- .../android/settings/core/InstrumentedFragment.java | 2 +- .../core/InstrumentedPreferenceFragment.java | 2 +- .../settings/core/TogglePreferenceController.java | 2 +- .../instrumentation/InstrumentedDialogFragment.java | 2 +- .../dashboard/DashboardFeatureProviderImpl.java | 2 +- .../profileselector/ProfileSelectDialog.java | 4 ++-- .../suggestions/SuggestionStateProvider.java | 2 +- .../settings/datausage/CellDataPreference.java | 2 +- .../android/settings/datausage/DataSaverBackend.java | 2 +- .../UnrestrictedDataAccessPreferenceController.java | 2 +- .../DevelopmentSettingsDashboardFragment.java | 4 ++-- .../development/qstile/DevelopmentTiles.java | 4 ++-- .../BrandedAccountPreferenceController.java | 2 +- .../deviceinfo/BuildNumberPreferenceController.java | 6 +++--- .../settings/deviceinfo/StorageWizardFormatSlow.java | 6 +++--- .../settings/deviceinfo/StorageWizardInit.java | 4 ++-- .../deviceinfo/StorageWizardMigrateConfirm.java | 4 ++-- .../BatteryFirstUseDatePreferenceController.java | 4 ++-- .../BatteryManufactureDatePreferenceController.java | 4 ++-- ...cStorageManagementSwitchPreferenceController.java | 2 +- .../storage/ManageStoragePreferenceController.java | 2 +- .../storage/StorageItemPreferenceController.java | 2 +- .../display/AdaptiveSleepPreferenceController.java | 2 +- ...ientDisplayNotificationsPreferenceController.java | 2 +- .../display/AutoRotatePreferenceController.java | 2 +- .../display/AutoRotateSwitchBarController.java | 2 +- .../BatteryPercentagePreferenceController.java | 2 +- .../display/ControlsPrivacyPreferenceController.java | 2 +- .../DeviceStateAutoRotateSettingController.java | 2 +- .../NightDisplayActivationPreferenceController.java | 2 +- .../settings/display/ScreenTimeoutSettings.java | 2 +- .../settings/display/SmartAutoRotateController.java | 2 +- .../display/SmartAutoRotatePreferenceController.java | 2 +- .../settings/display/ThemePreferenceController.java | 2 +- .../TwilightLocationPreferenceController.java | 2 +- .../display/WalletPrivacyPreferenceController.java | 2 +- .../DarkModeActivationPreferenceController.java | 2 +- .../settings/dream/DreamPickerController.java | 2 +- .../emergency/MoreSettingsPreferenceController.java | 2 +- .../settings/fuelgauge/AdvancedPowerUsageDetail.java | 4 ++-- .../android/settings/fuelgauge/HighPowerDetail.java | 2 +- .../fuelgauge/RestrictAppPreferenceController.java | 2 +- .../settings/fuelgauge/RestrictedAppDetails.java | 2 +- .../batterysaver/BatterySaverScheduleSettings.java | 2 +- .../batterytip/BatteryTipPreferenceController.java | 2 +- .../batterytip/actions/BatteryTipAction.java | 2 +- .../BatteryChartPreferenceController.java | 2 +- .../BatteryUsageBreakdownController.java | 2 +- .../settings/gestures/DoubleTapPowerSettings.java | 2 +- .../settings/gestures/DoubleTapScreenSettings.java | 2 +- .../gestures/DoubleTwistGestureSettings.java | 2 +- .../settings/gestures/PickupGestureSettings.java | 2 +- .../gestures/SwipeToNotificationSettings.java | 2 +- .../gestures/SystemNavigationGestureSettings.java | 2 +- .../settings/gestures/TapScreenGestureSettings.java | 2 +- .../settings/homepage/SettingsHomepageActivity.java | 6 +++--- .../android/settings/homepage/TopLevelSettings.java | 2 +- .../contextualcards/ContextualCardLoader.java | 4 ++-- .../contextualcards/ContextualCardManager.java | 2 +- .../contextualcards/ContextualCardsFragment.java | 4 ++-- .../contextualcards/EligibleCardChecker.java | 2 +- .../conditional/ConditionContextualCardRenderer.java | 4 ++-- .../ConditionFooterContextualCardRenderer.java | 4 ++-- .../ConditionHeaderContextualCardRenderer.java | 4 ++-- .../LegacySuggestionContextualCardController.java | 2 +- .../contextualcards/slices/DarkThemeSlice.java | 2 +- .../slices/SliceContextualCardController.java | 4 ++-- .../slices/SliceFullCardRendererHelper.java | 2 +- .../slices/SliceHalfCardRendererHelper.java | 2 +- .../ModifierKeysPickerDialogFragment.java | 4 ++-- .../ModifierKeysPreferenceController.java | 2 +- .../inputmethod/ModifierKeysResetDialogFragment.java | 2 +- .../NewKeyboardLayoutPickerController.java | 2 +- .../inputmethod/PhysicalKeyboardFragment.java | 2 +- .../TouchGesturesButtonPreferenceController.java | 2 +- .../TrackpadBottomPreferenceController.java | 2 +- .../TrackpadGoBackPreferenceController.java | 2 +- .../TrackpadGoHomePreferenceController.java | 2 +- .../TrackpadNotificationsPreferenceController.java | 2 +- .../TrackpadPointerSpeedPreferenceController.java | 2 +- .../TrackpadRecentAppsPreferenceController.java | 2 +- ...TrackpadReverseScrollingPreferenceController.java | 2 +- .../TrackpadSwitchAppsPreferenceController.java | 2 +- .../TrackpadTapToClickPreferenceController.java | 2 +- .../settings/inputmethod/UserDictionarySettings.java | 2 +- .../language/PhoneLanguagePreferenceController.java | 2 +- .../localepicker/AppLocalePickerActivity.java | 2 +- .../settings/localepicker/LocaleDialogFragment.java | 4 ++-- .../localepicker/LocaleDragAndDropAdapter.java | 4 ++-- .../LocaleHelperPreferenceController.java | 2 +- .../settings/localepicker/LocaleListEditor.java | 2 +- .../settings/location/AppSettingsInjector.java | 2 +- ...centLocationAccessSeeAllPreferenceController.java | 2 +- .../BluetoothWiFiResetPreferenceController.java | 2 +- .../settings/network/MobileNetworkRepository.java | 2 +- .../network/MobileNetworkSummaryController.java | 2 +- .../network/PrivateDnsModeDialogPreference.java | 2 +- .../network/WifiSwitchPreferenceController.java | 2 +- .../AutoDataSwitchPreferenceController.java | 2 +- .../telephony/Enable2gPreferenceController.java | 2 +- .../network/telephony/NetworkSelectSettings.java | 2 +- .../nfc/NfcForegroundPreferenceController.java | 2 +- .../LockScreenNotificationPreferenceController.java | 4 ++-- .../RedactNotificationPreferenceController.java | 2 +- .../zen/AbstractZenModePreferenceController.java | 2 +- .../notification/zen/ZenOnboardingActivity.java | 2 +- src/com/android/settings/overlay/FeatureFactory.kt | 11 ----------- src/com/android/settings/panel/PanelFragment.java | 4 ++-- .../android/settings/panel/PanelSlicesAdapter.java | 2 +- .../settings/password/SetNewPasswordActivity.java | 2 +- .../NumberingSystemItemController.java | 2 +- ...gionalPreferenceListBasePreferenceController.java | 5 +---- .../settings/search/SearchFeatureProvider.java | 4 ++-- .../settings/search/SearchResultTrampoline.java | 4 ++-- .../search/actionbar/SearchMenuController.java | 4 ++-- .../ChangeScreenLockPreferenceController.java | 4 ++-- .../ConfirmSimDeletionPreferenceController.java | 2 +- .../LockUnificationPreferenceController.java | 2 +- .../security/ScreenLockPreferenceDetailsUtils.java | 2 +- .../settings/security/SecurityAdvancedSettings.java | 2 +- .../android/settings/security/SecuritySettings.java | 2 +- .../TopLevelSecurityEntryPreferenceController.java | 2 +- .../VisiblePatternProfilePreferenceController.java | 2 +- .../LockAfterTimeoutPreferenceController.java | 2 +- .../PowerButtonInstantLockPreferenceController.java | 2 +- .../ManageTrustAgentsPreferenceController.java | 2 +- .../TrustAgentListPreferenceController.java | 2 +- .../trustagent/TrustAgentsPreferenceController.java | 2 +- .../shortcut/CreateShortcutPreferenceController.java | 2 +- src/com/android/settings/sim/SimDialogActivity.java | 2 +- .../settings/slices/SettingsSliceProvider.java | 12 ++++++------ .../settings/slices/SliceBroadcastReceiver.java | 8 ++++---- .../android/settings/slices/SliceDataConverter.java | 4 ++-- .../settings/slices/SlicesDatabaseAccessor.java | 3 +-- src/com/android/settings/slices/SlicesIndexer.java | 2 +- src/com/android/settings/survey/SurveyMixin.java | 2 +- .../android/settings/tts/TextToSpeechSettings.java | 2 +- .../android/settings/vpn2/AppManagementFragment.java | 2 +- src/com/android/settings/vpn2/VpnSettings.java | 2 +- .../settings/widget/EntityHeaderController.java | 4 ++-- .../settings/widget/GenericSwitchController.java | 3 +-- .../settings/widget/SettingsMainSwitchBar.java | 2 +- src/com/android/settings/widget/SwitchBar.java | 2 +- .../settings/wifi/ChangeWifiStateDetails.java | 2 +- .../settings/wifi/ConfigureWifiEntryFragment.java | 2 +- .../settings/wifi/NetworkRequestDialogFragment.java | 2 +- .../wifi/WifiConnectionPreferenceController.java | 2 +- .../android/settings/wifi/WifiDialogActivity.java | 2 +- .../settings/wifi/WifiPickerTrackerHelper.java | 2 +- src/com/android/settings/wifi/WifiSettings.java | 2 +- .../wifi/addappnetworks/AddAppNetworksFragment.java | 2 +- .../wifi/details/WifiNetworkDetailsFragment.java | 2 +- .../wifi/dpp/WifiDppQrCodeScannerFragment.java | 2 +- .../wifi/repository/WifiHotspotRepository.java | 2 +- .../settings/wifi/slice/ContextualWifiSlice.java | 2 +- .../wifi/tether/WifiHotspotSecuritySettings.java | 4 ++-- .../wifi/tether/WifiHotspotSecurityViewModel.java | 4 ++-- .../wifi/tether/WifiHotspotSpeedSettings.java | 4 ++-- .../wifi/tether/WifiHotspotSpeedViewModel.java | 4 ++-- .../WifiTetherAutoOffPreferenceController.java | 2 +- ...herMaximizeCompatibilityPreferenceController.java | 2 +- .../WifiTetherPasswordPreferenceController.java | 2 +- .../tether/WifiTetherSSIDPreferenceController.java | 2 +- .../WifiTetherSecurityPreferenceController.java | 2 +- .../settings/wifi/tether/WifiTetherSettings.java | 2 +- .../settings/wifi/tether/WifiTetherViewModel.java | 2 +- .../instrumentation/MetricsFeatureProviderTest.java | 4 ++-- ...rageManagementSwitchPreferenceControllerTest.java | 2 -- .../slices/SliceControllerInXmlCodeInspector.java | 4 ++-- .../slices/SliceControllerInXmlCodeInspector.java | 4 ++-- 220 files changed, 282 insertions(+), 306 deletions(-) diff --git a/src/com/android/settings/AirplaneModeEnabler.java b/src/com/android/settings/AirplaneModeEnabler.java index 735ae23e786..f3fd3a0d8f5 100644 --- a/src/com/android/settings/AirplaneModeEnabler.java +++ b/src/com/android/settings/AirplaneModeEnabler.java @@ -67,7 +67,7 @@ public class AirplaneModeEnabler extends GlobalSettingsChangeListener { super(context, Settings.Global.AIRPLANE_MODE_ON); mContext = context; - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); mOnAirplaneModeChangedListener = listener; mTelephonyManager = context.getSystemService(TelephonyManager.class); diff --git a/src/com/android/settings/BugreportPreference.java b/src/com/android/settings/BugreportPreference.java index 598399a3be9..3c3e60855a3 100644 --- a/src/com/android/settings/BugreportPreference.java +++ b/src/com/android/settings/BugreportPreference.java @@ -87,7 +87,7 @@ public class BugreportPreference extends CustomDialogPreferenceCompat { final Context context = getContext(); if (mFullTitle.isChecked()) { Log.v(TAG, "Taking full bugreport right away"); - FeatureFactory.getFactory(context).getMetricsFeatureProvider().action(context, + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider().action(context, SettingsEnums.ACTION_BUGREPORT_FROM_SETTINGS_FULL); try { ActivityManager.getService().requestFullBugReport(); @@ -96,7 +96,7 @@ public class BugreportPreference extends CustomDialogPreferenceCompat { } } else { Log.v(TAG, "Taking interactive bugreport right away"); - FeatureFactory.getFactory(context).getMetricsFeatureProvider().action(context, + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider().action(context, SettingsEnums.ACTION_BUGREPORT_FROM_SETTINGS_INTERACTIVE); try { ActivityManager.getService().requestInteractiveBugReport(); diff --git a/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java b/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java index c108d6ed6d9..3e3674c50a2 100644 --- a/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java +++ b/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java @@ -237,7 +237,7 @@ public class AccessibilityDetailsSettingsFragment extends InstrumentedFragment { new ComponentName(packageName, tileServiceClassName).flattenToString()); } - final int metricsCategory = FeatureFactory.getFactory(getActivity().getApplicationContext()) + final int metricsCategory = FeatureFactory.getFeatureFactory() .getAccessibilityMetricsFeatureProvider() .getDownloadedFeatureMetricsCategory(componentName); extras.putInt(AccessibilitySettings.EXTRA_METRICS_CATEGORY, metricsCategory); diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index ecafcd83ea1..f94be102b6e 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -554,7 +554,7 @@ public class AccessibilitySettings extends DashboardFragment { @Override public List getRawDataToIndex(Context context, boolean enabled) { - return FeatureFactory.getFactory(context) + return FeatureFactory.getFeatureFactory() .getAccessibilitySearchFeatureProvider().getSearchIndexableRawData( context); } diff --git a/src/com/android/settings/accessibility/CameraFlashNotificationPreferenceController.java b/src/com/android/settings/accessibility/CameraFlashNotificationPreferenceController.java index 8b9b8883294..7c96b0f9e5e 100644 --- a/src/com/android/settings/accessibility/CameraFlashNotificationPreferenceController.java +++ b/src/com/android/settings/accessibility/CameraFlashNotificationPreferenceController.java @@ -49,7 +49,7 @@ public class CameraFlashNotificationPreferenceController extends TogglePreferenc @Override public boolean setChecked(boolean isChecked) { - FeatureFactory.getFactory(mContext).getMetricsFeatureProvider().changed( + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider().changed( getMetricsCategory(), getPreferenceKey(), isChecked ? 1 : 0); return Settings.System.putInt(mContext.getContentResolver(), Settings.System.CAMERA_FLASH_NOTIFICATION, (isChecked ? ON : OFF)); diff --git a/src/com/android/settings/accessibility/RestrictedPreferenceHelper.java b/src/com/android/settings/accessibility/RestrictedPreferenceHelper.java index 235e96b84d2..17d2ac7e948 100644 --- a/src/com/android/settings/accessibility/RestrictedPreferenceHelper.java +++ b/src/com/android/settings/accessibility/RestrictedPreferenceHelper.java @@ -119,7 +119,7 @@ public class RestrictedPreferenceHelper { final String htmlDescription = info.loadHtmlDescription(mPm); final String settingsClassName = info.getSettingsActivityName(); final String tileServiceClassName = info.getTileServiceName(); - final int metricsCategory = FeatureFactory.getFactory(mContext) + final int metricsCategory = FeatureFactory.getFeatureFactory() .getAccessibilityMetricsFeatureProvider() .getDownloadedFeatureMetricsCategory(componentName); @@ -183,7 +183,7 @@ public class RestrictedPreferenceHelper { final String htmlDescription = info.loadHtmlDescription(mPm); final String settingsClassName = info.getSettingsActivityName(); final String tileServiceClassName = info.getTileServiceName(); - final int metricsCategory = FeatureFactory.getFactory(mContext) + final int metricsCategory = FeatureFactory.getFeatureFactory() .getAccessibilityMetricsFeatureProvider() .getDownloadedFeatureMetricsCategory(componentName); diff --git a/src/com/android/settings/accessibility/ScreenFlashNotificationPreferenceController.java b/src/com/android/settings/accessibility/ScreenFlashNotificationPreferenceController.java index 53abc95efb7..bd54aca7d46 100644 --- a/src/com/android/settings/accessibility/ScreenFlashNotificationPreferenceController.java +++ b/src/com/android/settings/accessibility/ScreenFlashNotificationPreferenceController.java @@ -63,7 +63,7 @@ public class ScreenFlashNotificationPreferenceController extends TogglePreferenc @Override public boolean setChecked(boolean isChecked) { - FeatureFactory.getFactory(mContext).getMetricsFeatureProvider().changed( + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider().changed( getMetricsCategory(), getPreferenceKey(), isChecked ? 1 : 0); if (isChecked) { checkAndSetInitialColor(); diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java index ce780693b97..db6a4ae2f7f 100644 --- a/src/com/android/settings/accounts/AccountPreferenceController.java +++ b/src/com/android/settings/accounts/AccountPreferenceController.java @@ -164,7 +164,7 @@ public class AccountPreferenceController extends AbstractPreferenceController if (mAuthorities != null) { mAuthoritiesCount = mAuthorities.length; } - final FeatureFactory featureFactory = FeatureFactory.getFactory(mContext); + final FeatureFactory featureFactory = FeatureFactory.getFeatureFactory(); mMetricsFeatureProvider = featureFactory.getMetricsFeatureProvider(); mHelper = helper; mType = type; diff --git a/src/com/android/settings/accounts/AvatarViewMixin.java b/src/com/android/settings/accounts/AvatarViewMixin.java index 6b04e9745ab..0925e24eafd 100644 --- a/src/com/android/settings/accounts/AvatarViewMixin.java +++ b/src/com/android/settings/accounts/AvatarViewMixin.java @@ -117,7 +117,7 @@ public class AvatarViewMixin implements LifecycleObserver { true /* finishSecondaryWithPrimary */, false /* clearTop */); - FeatureFactory.getFactory(mContext).getMetricsFeatureProvider() + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider() .logSettingsTileClick(KEY_AVATAR_ICON, SettingsEnums.SETTINGS_HOMEPAGE); // Here may have two different UI while start the activity. @@ -144,8 +144,8 @@ public class AvatarViewMixin implements LifecycleObserver { @VisibleForTesting boolean hasAccount() { - final Account accounts[] = FeatureFactory.getFactory( - mContext).getAccountFeatureProvider().getAccounts(mContext); + final Account[] accounts = FeatureFactory.getFeatureFactory().getAccountFeatureProvider() + .getAccounts(mContext); return (accounts != null) && (accounts.length > 0); } diff --git a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java index 7003eed252b..b8ebf611618 100644 --- a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java +++ b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java @@ -68,7 +68,7 @@ public class RemoveAccountPreferenceController extends AbstractPreferenceControl public RemoveAccountPreferenceController(Context context, Fragment parent) { super(context); mParentFragment = parent; - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } @Override diff --git a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java index e0b38dd9f32..c1b04ccf397 100644 --- a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java +++ b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java @@ -245,7 +245,7 @@ public class ActivityEmbeddingRulesController { private void registerAlwaysExpandRule() { final Set activityFilters = new HashSet<>(); if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SETTINGS_SEARCH_ALWAYS_EXPAND)) { - final Intent searchIntent = FeatureFactory.getFactory(mContext) + final Intent searchIntent = FeatureFactory.getFeatureFactory() .getSearchFeatureProvider() .buildSearchIntent(mContext, SettingsEnums.SETTINGS_HOMEPAGE); addActivityFilter(activityFilters, searchIntent); diff --git a/src/com/android/settings/applications/UsageAccessDetails.java b/src/com/android/settings/applications/UsageAccessDetails.java index 4adb6c17953..d0b743dd189 100644 --- a/src/com/android/settings/applications/UsageAccessDetails.java +++ b/src/com/android/settings/applications/UsageAccessDetails.java @@ -148,7 +148,7 @@ public class UsageAccessDetails extends AppInfoWithHeader implements OnPreferenc int logCategory = newState ? SettingsEnums.APP_SPECIAL_PERMISSION_USAGE_VIEW_ALLOW : SettingsEnums.APP_SPECIAL_PERMISSION_USAGE_VIEW_DENY; final MetricsFeatureProvider metricsFeatureProvider = - FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider(); + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); metricsFeatureProvider.action( metricsFeatureProvider.getAttribution(getActivity()), logCategory, diff --git a/src/com/android/settings/applications/appinfo/AppSettingPreferenceController.java b/src/com/android/settings/applications/appinfo/AppSettingPreferenceController.java index cacbffb946f..52ed31157c9 100644 --- a/src/com/android/settings/applications/appinfo/AppSettingPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppSettingPreferenceController.java @@ -59,7 +59,7 @@ public class AppSettingPreferenceController extends AppInfoPreferenceControllerB if (intent == null) { return false; } - FeatureFactory.getFactory(mContext).getMetricsFeatureProvider() + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider() .action(SettingsEnums.PAGE_UNKNOWN, SettingsEnums.ACTION_OPEN_APP_SETTING, mParent.getMetricsCategory(), diff --git a/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java b/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java index 5f7e56fa0e4..e1e5968bc0b 100644 --- a/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java +++ b/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java @@ -121,7 +121,7 @@ public class DrawOverlayDetails extends AppInfoWithHeader implements OnPreferenc int logCategory = newState ? SettingsEnums.APP_SPECIAL_PERMISSION_APPDRAW_ALLOW : SettingsEnums.APP_SPECIAL_PERMISSION_APPDRAW_DENY; final MetricsFeatureProvider metricsFeatureProvider = - FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider(); + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); metricsFeatureProvider.action( metricsFeatureProvider.getAttribution(getActivity()), logCategory, diff --git a/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragment.java b/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragment.java index 5a6d3df46c3..f514ed67862 100644 --- a/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragment.java +++ b/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragment.java @@ -63,7 +63,7 @@ public class InstantAppButtonDialogFragment extends InstrumentedDialogFragment i public void onClick(DialogInterface dialog, int which) { final Context context = getContext(); final PackageManager packageManager = context.getPackageManager(); - FeatureFactory.getFactory(context).getMetricsFeatureProvider() + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider() .action(context, SettingsEnums.ACTION_SETTINGS_CLEAR_INSTANT_APP, mPackageName); packageManager.deletePackageAsUser(mPackageName, null, 0, UserHandle.myUserId()); } diff --git a/src/com/android/settings/applications/appinfo/ManageExternalStorageDetails.java b/src/com/android/settings/applications/appinfo/ManageExternalStorageDetails.java index 6c840d5d94d..4253bd98146 100644 --- a/src/com/android/settings/applications/appinfo/ManageExternalStorageDetails.java +++ b/src/com/android/settings/applications/appinfo/ManageExternalStorageDetails.java @@ -67,7 +67,7 @@ public class ManageExternalStorageDetails extends AppInfoWithHeader implements mSwitchPref.setOnPreferenceChangeListener(this); mMetricsFeatureProvider = - FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider(); + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } @Override diff --git a/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java b/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java index d17f843a337..476cd4e4995 100644 --- a/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java +++ b/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java @@ -89,7 +89,7 @@ public class WriteSettingsDetails extends AppInfoWithHeader implements OnPrefere void logSpecialPermissionChange(boolean newState, String packageName) { int logCategory = newState ? SettingsEnums.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_ALLOW : SettingsEnums.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_DENY; - FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider().action(getContext(), + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider().action(getContext(), logCategory, packageName); } diff --git a/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java b/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java index 57fe3d209d3..b8f1b4c54c8 100644 --- a/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java +++ b/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java @@ -246,7 +246,7 @@ public class ApplicationViewHolder extends RecyclerView.ViewHolder { public void onClick(View v) { CloneBackend cloneBackend = CloneBackend.getInstance(context); final MetricsFeatureProvider metricsFeatureProvider = - FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); String packageName = entry.info.packageName; diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java index c43bde64a35..8ab3ee4a4d8 100644 --- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java +++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java @@ -573,7 +573,7 @@ public class DeviceAdminAdd extends CollapsingToolbarBaseActivity { void logSpecialPermissionChange(boolean allow, String packageName) { int logCategory = allow ? SettingsEnums.APP_SPECIAL_PERMISSION_ADMIN_ALLOW : SettingsEnums.APP_SPECIAL_PERMISSION_ADMIN_DENY; - FeatureFactory.getFactory(this).getMetricsFeatureProvider().action( + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider().action( SettingsEnums.PAGE_UNKNOWN, logCategory, SettingsEnums.PAGE_UNKNOWN, diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java index 94033165c1d..1184d8e41c5 100644 --- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java +++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java @@ -104,7 +104,7 @@ public class DeviceAdminListPreferenceController extends BasePreferenceControlle mUm = (UserManager) context.getSystemService(Context.USER_SERVICE); mPackageManager = mContext.getPackageManager(); mIPackageManager = AppGlobals.getPackageManager(); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } @Override diff --git a/src/com/android/settings/applications/specialaccess/notificationaccess/ApprovalPreferenceController.java b/src/com/android/settings/applications/specialaccess/notificationaccess/ApprovalPreferenceController.java index 6bee62cc688..e3816bf755c 100644 --- a/src/com/android/settings/applications/specialaccess/notificationaccess/ApprovalPreferenceController.java +++ b/src/com/android/settings/applications/specialaccess/notificationaccess/ApprovalPreferenceController.java @@ -135,7 +135,7 @@ public class ApprovalPreferenceController extends BasePreferenceController { void logSpecialPermissionChange(boolean enable, String packageName) { final int logCategory = enable ? SettingsEnums.APP_SPECIAL_PERMISSION_NOTIVIEW_ALLOW : SettingsEnums.APP_SPECIAL_PERMISSION_NOTIVIEW_DENY; - FeatureFactory.getFactory(mContext).getMetricsFeatureProvider().action(mContext, + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider().action(mContext, logCategory, packageName); } } \ No newline at end of file diff --git a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetails.java b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetails.java index 1c322ff6c49..7d557bec28b 100644 --- a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetails.java +++ b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetails.java @@ -124,7 +124,7 @@ public class PictureInPictureDetails extends AppInfoWithHeader ? SettingsEnums.APP_PICTURE_IN_PICTURE_ALLOW : SettingsEnums.APP_PICTURE_IN_PICTURE_DENY; final MetricsFeatureProvider metricsFeatureProvider = - FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider(); + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); metricsFeatureProvider.action( metricsFeatureProvider.getAttribution(getActivity()), logCategory, diff --git a/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java b/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java index 54ac63ebca5..c186e07a327 100644 --- a/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java +++ b/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java @@ -126,7 +126,7 @@ public class PremiumSmsAccess extends EmptyTextSettings if (category != SmsManager.PREMIUM_SMS_CONSENT_UNKNOWN) { // TODO(117860032): Category is wrong. It should be defined in SettingsEnums. final MetricsFeatureProvider metricsFeatureProvider = - FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider(); + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); metricsFeatureProvider.action( metricsFeatureProvider.getAttribution(getActivity()), category, diff --git a/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java b/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java index a70d03e46ac..d35a4927068 100644 --- a/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java +++ b/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java @@ -69,7 +69,7 @@ public class VrListenerSettings extends ManagedServiceSettings { int logCategory = enable ? SettingsEnums.APP_SPECIAL_PERMISSION_VRHELPER_ALLOW : SettingsEnums.APP_SPECIAL_PERMISSION_VRHELPER_DENY; final MetricsFeatureProvider metricsFeatureProvider = - FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider(); + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); metricsFeatureProvider.action( metricsFeatureProvider.getAttribution(getActivity()), logCategory, diff --git a/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessController.java b/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessController.java index 2c52a8c6d62..b4a0c88d950 100644 --- a/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessController.java +++ b/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessController.java @@ -23,7 +23,6 @@ import android.app.settings.SettingsEnums; import android.content.Context; import android.content.pm.PackageInfo; import android.content.pm.ParceledListSlice; -import android.os.AsyncTask; import android.os.RemoteException; import android.util.ArraySet; import android.util.Log; @@ -110,7 +109,7 @@ public class ZenAccessController extends BasePreferenceController { static void logSpecialPermissionChange(boolean enable, String packageName, Context context) { int logCategory = enable ? SettingsEnums.APP_SPECIAL_PERMISSION_DND_ALLOW : SettingsEnums.APP_SPECIAL_PERMISSION_DND_DENY; - FeatureFactory.getFactory(context).getMetricsFeatureProvider().action(context, + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider().action(context, logCategory, packageName); } } diff --git a/src/com/android/settings/biometrics/BiometricEnrollActivity.java b/src/com/android/settings/biometrics/BiometricEnrollActivity.java index fe7d5384062..40763e3934e 100644 --- a/src/com/android/settings/biometrics/BiometricEnrollActivity.java +++ b/src/com/android/settings/biometrics/BiometricEnrollActivity.java @@ -238,7 +238,7 @@ public class BiometricEnrollActivity extends InstrumentedActivity { if (parentalConsent && isMultiSensor && mIsFaceEnrollable) { // Exclude face enrollment from setup wizard if feature config not supported // in setup wizard flow, we still allow user enroll faces through settings. - mIsFaceEnrollable = FeatureFactory.getFactory(getApplicationContext()) + mIsFaceEnrollable = FeatureFactory.getFeatureFactory() .getFaceFeatureProvider() .isSetupWizardSupported(getApplicationContext()); Log.d(TAG, "config_suw_support_face_enroll: " + mIsFaceEnrollable); diff --git a/src/com/android/settings/biometrics/BiometricEnrollBase.java b/src/com/android/settings/biometrics/BiometricEnrollBase.java index 6e110799c46..c9c8cff034c 100644 --- a/src/com/android/settings/biometrics/BiometricEnrollBase.java +++ b/src/com/android/settings/biometrics/BiometricEnrollBase.java @@ -171,7 +171,7 @@ public abstract class BiometricEnrollBase extends InstrumentedActivity { mNextLaunched = savedInstanceState.getBoolean(EXTRA_KEY_NEXT_LAUNCHED); } mUserId = getIntent().getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId()); - mPostureGuidanceIntent = FeatureFactory.getFactory(getApplicationContext()) + mPostureGuidanceIntent = FeatureFactory.getFeatureFactory() .getFaceFeatureProvider().getPostureGuidanceIntent(getApplicationContext()); } diff --git a/src/com/android/settings/biometrics/BiometricStatusPreferenceController.java b/src/com/android/settings/biometrics/BiometricStatusPreferenceController.java index 2f9ae6b8117..b9d20720e1e 100644 --- a/src/com/android/settings/biometrics/BiometricStatusPreferenceController.java +++ b/src/com/android/settings/biometrics/BiometricStatusPreferenceController.java @@ -71,7 +71,7 @@ public abstract class BiometricStatusPreferenceController extends BasePreference public BiometricStatusPreferenceController(Context context, String key) { super(context, key); mUm = (UserManager) context.getSystemService(Context.USER_SERVICE); - mLockPatternUtils = FeatureFactory.getFactory(context) + mLockPatternUtils = FeatureFactory.getFeatureFactory() .getSecurityFeatureProvider() .getLockPatternUtils(context); mProfileChallengeUserId = Utils.getManagedProfileId(mUm, mUserId); diff --git a/src/com/android/settings/biometrics/BiometricUtils.java b/src/com/android/settings/biometrics/BiometricUtils.java index 6b6d952ed03..53892bd9a1c 100644 --- a/src/com/android/settings/biometrics/BiometricUtils.java +++ b/src/com/android/settings/biometrics/BiometricUtils.java @@ -514,7 +514,7 @@ public class BiometricUtils { * Returns true if the device supports Face enrollment in SUW flow */ public static boolean isFaceSupportedInSuw(Context context) { - return FeatureFactory.getFactory(context).getFaceFeatureProvider().isSetupWizardSupported( + return FeatureFactory.getFeatureFactory().getFaceFeatureProvider().isSetupWizardSupported( context); } diff --git a/src/com/android/settings/biometrics/face/FaceSettings.java b/src/com/android/settings/biometrics/face/FaceSettings.java index 2e9440412ec..bebb5c70cab 100644 --- a/src/com/android/settings/biometrics/face/FaceSettings.java +++ b/src/com/android/settings/biometrics/face/FaceSettings.java @@ -182,7 +182,7 @@ public class FaceSettings extends DashboardFragment { mUserId = getActivity().getIntent().getIntExtra( Intent.EXTRA_USER_ID, UserHandle.myUserId()); - mFaceFeatureProvider = FeatureFactory.getFactory(getContext()).getFaceFeatureProvider(); + mFaceFeatureProvider = FeatureFactory.getFeatureFactory().getFaceFeatureProvider(); if (mUserManager.getUserInfo(mUserId).isManagedProfile()) { getActivity().setTitle( @@ -418,13 +418,9 @@ public class FaceSettings extends DashboardFragment { } private boolean isAttentionSupported(Context context) { - FaceFeatureProvider featureProvider = FeatureFactory.getFactory( - context).getFaceFeatureProvider(); - boolean isAttentionSupported = false; - if (featureProvider != null) { - isAttentionSupported = featureProvider.isAttentionSupported(context); - } - return isAttentionSupported; + FaceFeatureProvider featureProvider = + FeatureFactory.getFeatureFactory().getFaceFeatureProvider(); + return featureProvider.isAttentionSupported(context); } private boolean hasEnrolledBiometrics(Context context) { diff --git a/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceController.java index 0ce02ab6d0f..e2123f05eff 100644 --- a/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceController.java +++ b/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceController.java @@ -49,7 +49,7 @@ public class FaceSettingsFooterPreferenceController extends BasePreferenceContro public FaceSettingsFooterPreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); - mProvider = FeatureFactory.getFactory(context).getFaceFeatureProvider(); + mProvider = FeatureFactory.getFeatureFactory().getFaceFeatureProvider(); } @Override diff --git a/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java index 1e74ad7c822..739de6b2448 100644 --- a/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java +++ b/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java @@ -170,7 +170,7 @@ public class FaceSettingsRemoveButtonPreferenceController extends BasePreference super(context, preferenceKey); mContext = context; mFaceManager = context.getSystemService(FaceManager.class); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); mFaceUpdater = new FaceUpdater(context, mFaceManager); } diff --git a/src/com/android/settings/biometrics2/factory/BiometricsViewModelFactory.java b/src/com/android/settings/biometrics2/factory/BiometricsViewModelFactory.java index 2cf607a7311..516f47170eb 100644 --- a/src/com/android/settings/biometrics2/factory/BiometricsViewModelFactory.java +++ b/src/com/android/settings/biometrics2/factory/BiometricsViewModelFactory.java @@ -69,9 +69,9 @@ public class BiometricsViewModelFactory implements ViewModelProvider.Factory { Log.w(TAG, "create, null application"); return create(modelClass); } - final FeatureFactory featureFactory = FeatureFactory.getFactory(application); - final BiometricsRepositoryProvider provider = FeatureFactory.getFactory(application) - .getBiometricsRepositoryProvider(); + final FeatureFactory featureFactory = FeatureFactory.getFeatureFactory(); + final BiometricsRepositoryProvider provider = + featureFactory.getBiometricsRepositoryProvider(); if (modelClass.isAssignableFrom(AutoCredentialViewModel.class)) { final LockPatternUtils lockPatternUtils = diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsController.java index e3f0f093505..ad65ce4bdad 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsController.java @@ -185,7 +185,7 @@ public class BluetoothDetailsCompanionAppsController extends BluetoothDetailsCon public void updatePreferences(Context context, String address, PreferenceCategory container) { // If the device is FastPair, remove CDM companion apps. - final BluetoothFeatureProvider bluetoothFeatureProvider = FeatureFactory.getFactory(context) + final BluetoothFeatureProvider bluetoothFeatureProvider = FeatureFactory.getFeatureFactory() .getBluetoothFeatureProvider(); final boolean sliceEnabled = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SETTINGS_UI, SettingsUIDeviceConfig.BT_SLICE_SETTINGS_ENABLED, true); diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsController.java index 5444f682f97..3338fe90cbb 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsController.java @@ -51,7 +51,7 @@ public abstract class BluetoothDetailsController extends AbstractPreferenceContr mFragment = fragment; mCachedDevice = device; lifecycle.addObserver(this); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } @Override diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsRelatedToolsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsRelatedToolsController.java index bfaea85d20f..dc5a91ad625 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsRelatedToolsController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsRelatedToolsController.java @@ -75,8 +75,8 @@ public class BluetoothDetailsRelatedToolsController extends BluetoothDetailsCont mPreferenceCategory.removePreference(liveCaptionPreference); } - final List relatedToolsList = FeatureFactory.getFactory( - mContext).getBluetoothFeatureProvider().getRelatedTools(); + final List relatedToolsList = + FeatureFactory.getFeatureFactory().getBluetoothFeatureProvider().getRelatedTools(); if (!CollectionUtils.isEmpty(relatedToolsList)) { addAccessibilityInstalledRelatedPreference(relatedToolsList); } diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java index 99f3e3187cb..534cc61d008 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java @@ -173,8 +173,8 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment use(LeAudioBluetoothDetailsHeaderController.class).init(mCachedDevice, mManager); use(KeyboardSettingsPreferenceController.class).init(mCachedDevice); - final BluetoothFeatureProvider featureProvider = FeatureFactory.getFactory( - context).getBluetoothFeatureProvider(); + final BluetoothFeatureProvider featureProvider = + FeatureFactory.getFeatureFactory().getBluetoothFeatureProvider(); final boolean sliceEnabled = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SETTINGS_UI, SettingsUIDeviceConfig.BT_SLICE_SETTINGS_ENABLED, true); @@ -184,8 +184,8 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment } private void updateExtraControlUri(int viewWidth) { - BluetoothFeatureProvider featureProvider = FeatureFactory.getFactory( - getContext()).getBluetoothFeatureProvider(); + BluetoothFeatureProvider featureProvider = + FeatureFactory.getFeatureFactory().getBluetoothFeatureProvider(); boolean sliceEnabled = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SETTINGS_UI, SettingsUIDeviceConfig.BT_SLICE_SETTINGS_ENABLED, true); Uri controlUri = null; diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePairingDetailBase.java b/src/com/android/settings/bluetooth/BluetoothDevicePairingDetailBase.java index f2bc6fcfde6..67c32ed5da1 100644 --- a/src/com/android/settings/bluetooth/BluetoothDevicePairingDetailBase.java +++ b/src/com/android/settings/bluetooth/BluetoothDevicePairingDetailBase.java @@ -99,8 +99,8 @@ public abstract class BluetoothDevicePairingDetailBase extends DeviceListPrefere return; } else if (bondState == BluetoothDevice.BOND_BONDING) { // Set the bond entry where binding process starts for logging hearing aid device info - final int pageId = FeatureFactory.getFactory( - getContext()).getMetricsFeatureProvider().getAttribution(getActivity()); + final int pageId = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider() + .getAttribution(getActivity()); final int bondEntry = AccessibilityStatsLogUtils.convertToHearingAidInfoBondEntry( pageId); HearingAidStatsLogUtils.setBondEntryForDevice(bondEntry, cachedDevice); diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java index 082f8cf9d28..014a02b119a 100644 --- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java +++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java @@ -334,7 +334,7 @@ public final class BluetoothDevicePreference extends GearPreference { int bondState = mCachedDevice.getBondState(); final MetricsFeatureProvider metricsFeatureProvider = - FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); if (mCachedDevice.isConnected()) { metricsFeatureProvider.action(context, diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java b/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java index e8751dcde54..4c70b95ccbf 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java @@ -38,7 +38,7 @@ public class BluetoothDeviceRenamePreferenceController extends */ public BluetoothDeviceRenamePreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } @Override diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java index 2935c6779dc..59aa4186431 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java @@ -82,7 +82,7 @@ public abstract class BluetoothDeviceUpdater implements BluetoothCallback, mPreferenceMap = new HashMap<>(); mLocalManager = localManager; mMetricsCategory = metricsCategory; - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } /** diff --git a/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java index 5c3af9b5cf5..6fd5070303c 100644 --- a/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java +++ b/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java @@ -68,7 +68,7 @@ public class BluetoothSwitchPreferenceController mBluetoothEnabler = new BluetoothEnabler(context, switchController, - FeatureFactory.getFactory(context).getMetricsFeatureProvider(), + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(), SettingsEnums.ACTION_SETTINGS_MASTER_SWITCH_BLUETOOTH_TOGGLE, mRestrictionUtils); mBluetoothEnabler.setToggleCallback(this); diff --git a/src/com/android/settings/bluetooth/Utils.java b/src/com/android/settings/bluetooth/Utils.java index a79ee1cf396..f8c033c615e 100644 --- a/src/com/android/settings/bluetooth/Utils.java +++ b/src/com/android/settings/bluetooth/Utils.java @@ -106,7 +106,7 @@ public final class Utils { @VisibleForTesting static void showConnectingError(Context context, String name, LocalBluetoothManager manager) { - FeatureFactory.getFactory(context).getMetricsFeatureProvider().visible(context, + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider().visible(context, SettingsEnums.PAGE_UNKNOWN, SettingsEnums.ACTION_SETTINGS_BLUETOOTH_CONNECT_ERROR, 0); showError(context, name, R.string.bluetooth_connecting_error_message, manager); diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java b/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java index f7517b4847f..5be761efc79 100644 --- a/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java +++ b/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java @@ -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() diff --git a/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java b/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java index 5c906fd2e49..7a2ae04f3e1 100644 --- a/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java +++ b/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java @@ -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(); } diff --git a/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java b/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java index 3034e2fa785..fb35dd9f58c 100644 --- a/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java +++ b/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java @@ -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); } diff --git a/src/com/android/settings/connecteddevice/stylus/StylusDeviceUpdater.java b/src/com/android/settings/connecteddevice/stylus/StylusDeviceUpdater.java index 1187c59e8d7..5bf97ab0d04 100644 --- a/src/com/android/settings/connecteddevice/stylus/StylusDeviceUpdater.java +++ b/src/com/android/settings/connecteddevice/stylus/StylusDeviceUpdater.java @@ -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); } diff --git a/src/com/android/settings/connecteddevice/stylus/StylusUsbFirmwareController.java b/src/com/android/settings/connecteddevice/stylus/StylusUsbFirmwareController.java index 0f79d3e32a9..08fdd7381fe 100644 --- a/src/com/android/settings/connecteddevice/stylus/StylusUsbFirmwareController.java +++ b/src/com/android/settings/connecteddevice/stylus/StylusUsbFirmwareController.java @@ -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 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); } diff --git a/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java b/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java index d76ac697c4f..221aab54ab4 100644 --- a/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java +++ b/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java @@ -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() { diff --git a/src/com/android/settings/core/InstrumentedActivity.java b/src/com/android/settings/core/InstrumentedActivity.java index be350a8f3d8..a0849a8bc3a 100644 --- a/src/com/android/settings/core/InstrumentedActivity.java +++ b/src/com/android/settings/core/InstrumentedActivity.java @@ -33,6 +33,6 @@ public abstract class InstrumentedActivity extends ObservableActivity implements super.onCreate(savedInstanceState); // Mixin that logs visibility change for activity. getSettingsLifecycle().addObserver(new VisibilityLoggerMixin(getMetricsCategory(), - FeatureFactory.getFactory(this).getMetricsFeatureProvider())); + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider())); } } diff --git a/src/com/android/settings/core/InstrumentedFragment.java b/src/com/android/settings/core/InstrumentedFragment.java index c4ceb4add77..b98c2701ea1 100644 --- a/src/com/android/settings/core/InstrumentedFragment.java +++ b/src/com/android/settings/core/InstrumentedFragment.java @@ -33,7 +33,7 @@ public abstract class InstrumentedFragment extends ObservableFragment implements @Override public void onAttach(Context context) { - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); mVisibilityLoggerMixin = new VisibilityLoggerMixin(getMetricsCategory(), mMetricsFeatureProvider); // Mixin that logs visibility change for activity. diff --git a/src/com/android/settings/core/InstrumentedPreferenceFragment.java b/src/com/android/settings/core/InstrumentedPreferenceFragment.java index bff405b8e6d..ba92eaef4d7 100644 --- a/src/com/android/settings/core/InstrumentedPreferenceFragment.java +++ b/src/com/android/settings/core/InstrumentedPreferenceFragment.java @@ -57,7 +57,7 @@ public abstract class InstrumentedPreferenceFragment extends ObservablePreferenc @Override public void onAttach(Context context) { - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); // Mixin that logs visibility change for activity. mVisibilityLoggerMixin = new VisibilityLoggerMixin(getMetricsCategory(), mMetricsFeatureProvider); diff --git a/src/com/android/settings/core/TogglePreferenceController.java b/src/com/android/settings/core/TogglePreferenceController.java index f14e0b23b87..a6c67ebd1e1 100644 --- a/src/com/android/settings/core/TogglePreferenceController.java +++ b/src/com/android/settings/core/TogglePreferenceController.java @@ -81,7 +81,7 @@ public abstract class TogglePreferenceController extends BasePreferenceControlle // TwoStatePreference is a regular preference and can be handled by DashboardFragment if (preference instanceof PrimarySwitchPreference || preference instanceof TwoStateButtonPreference) { - FeatureFactory.getFactory(mContext).getMetricsFeatureProvider() + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider() .logClickedPreference(preference, getMetricsCategory()); } return setChecked((boolean) newValue); diff --git a/src/com/android/settings/core/instrumentation/InstrumentedDialogFragment.java b/src/com/android/settings/core/instrumentation/InstrumentedDialogFragment.java index 0a214f17315..9f92537cd22 100644 --- a/src/com/android/settings/core/instrumentation/InstrumentedDialogFragment.java +++ b/src/com/android/settings/core/instrumentation/InstrumentedDialogFragment.java @@ -46,7 +46,7 @@ public abstract class InstrumentedDialogFragment extends ObservableDialogFragmen @Override public void onAttach(Context context) { super.onAttach(context); - mMetricsFeatureProvider = FeatureFactory.getFactory(context) + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory() .getMetricsFeatureProvider(); mLifecycle.addObserver(new VisibilityLoggerMixin(getMetricsCategory(), mMetricsFeatureProvider)); diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java index 578493a47d2..3345a55e59d 100644 --- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java +++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java @@ -100,7 +100,7 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider { public DashboardFeatureProviderImpl(Context context) { mContext = context.getApplicationContext(); mCategoryManager = CategoryManager.get(context); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); mPackageManager = context.getPackageManager(); } diff --git a/src/com/android/settings/dashboard/profileselector/ProfileSelectDialog.java b/src/com/android/settings/dashboard/profileselector/ProfileSelectDialog.java index 58a51cb32dc..6b50b70d25c 100644 --- a/src/com/android/settings/dashboard/profileselector/ProfileSelectDialog.java +++ b/src/com/android/settings/dashboard/profileselector/ProfileSelectDialog.java @@ -130,14 +130,14 @@ public class ProfileSelectDialog extends DialogFragment implements UserAdapter.O final UserHandle user = mSelectedTile.userHandle.get(position); if (!mSelectedTile.hasPendingIntent()) { final Intent intent = new Intent(mSelectedTile.getIntent()); - FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider() + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider() .logStartedIntentWithProfile(intent, mSourceMetricCategory, position == 1 /* isWorkProfile */); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); getActivity().startActivityAsUser(intent, user); } else { PendingIntent pendingIntent = mSelectedTile.pendingIntentMap.get(user); - FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider() + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider() .logSettingsTileClickWithProfile(mSelectedTile.getKey(getContext()), mSourceMetricCategory, position == 1 /* isWorkProfile */); diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java b/src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java index e9a1e8dfd84..3995db6c4dc 100644 --- a/src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java +++ b/src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java @@ -83,7 +83,7 @@ public class SuggestionStateProvider extends ContentProvider { isComplete = true; } else { final Context context = getContext(); - isComplete = FeatureFactory.getFactory(context) + isComplete = FeatureFactory.getFeatureFactory() .getSuggestionFeatureProvider() .isSuggestionComplete(context, cn); } diff --git a/src/com/android/settings/datausage/CellDataPreference.java b/src/com/android/settings/datausage/CellDataPreference.java index 0e47bc4f2c4..aa763aecdb4 100644 --- a/src/com/android/settings/datausage/CellDataPreference.java +++ b/src/com/android/settings/datausage/CellDataPreference.java @@ -138,7 +138,7 @@ public class CellDataPreference extends CustomDialogPreferenceCompat @Override protected void performClick(View view) { final Context context = getContext(); - FeatureFactory.getFactory(context).getMetricsFeatureProvider() + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider() .action(context, SettingsEnums.ACTION_CELL_DATA_TOGGLE, !mChecked); final SubscriptionInfo currentSir = getActiveSubscriptionInfo(mSubId); final SubscriptionInfo nextSir = getActiveSubscriptionInfo( diff --git a/src/com/android/settings/datausage/DataSaverBackend.java b/src/com/android/settings/datausage/DataSaverBackend.java index 6a392341122..b4b6b8c886f 100644 --- a/src/com/android/settings/datausage/DataSaverBackend.java +++ b/src/com/android/settings/datausage/DataSaverBackend.java @@ -48,7 +48,7 @@ public class DataSaverBackend { public DataSaverBackend(@NotNull Context context) { // TODO(b/246537614):Use fragment context to DataSaverBackend class will caused memory leak mContext = context.getApplicationContext(); - mMetricsFeatureProvider = FeatureFactory.getFactory(mContext).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); mPolicyManager = NetworkPolicyManager.from(mContext); } diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java b/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java index 438ed0dc80f..0fb6e5067d0 100644 --- a/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java +++ b/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java @@ -233,7 +233,7 @@ public class UnrestrictedDataAccessPreferenceController extends BasePreferenceCo void logSpecialPermissionChange(boolean allowlisted, String packageName) { final int logCategory = allowlisted ? SettingsEnums.APP_SPECIAL_PERMISSION_UNL_DATA_ALLOW : SettingsEnums.APP_SPECIAL_PERMISSION_UNL_DATA_DENY; - FeatureFactory.getFactory(mContext).getMetricsFeatureProvider().action(mContext, + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider().action(mContext, logCategory, packageName); } diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index 3dd3c62503b..47b9d093bb9 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -372,8 +372,8 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra DisableDevSettingsDialogFragment.show(this /* host */); } } - FeatureFactory.getFactory( - getContext()).getSearchFeatureProvider().sendPreIndexIntent(getContext()); + FeatureFactory.getFeatureFactory().getSearchFeatureProvider() + .sendPreIndexIntent(getContext()); } } diff --git a/src/com/android/settings/development/qstile/DevelopmentTiles.java b/src/com/android/settings/development/qstile/DevelopmentTiles.java index e8d1c2cf648..4662149d3db 100644 --- a/src/com/android/settings/development/qstile/DevelopmentTiles.java +++ b/src/com/android/settings/development/qstile/DevelopmentTiles.java @@ -387,8 +387,8 @@ public abstract class DevelopmentTiles extends TileService { mSensorPrivacyManager = (SensorPrivacyManager) mContext.getSystemService( Context.SENSOR_PRIVACY_SERVICE); mIsEnabled = mSensorPrivacyManager.isAllSensorPrivacyEnabled(); - mMetricsFeatureProvider = FeatureFactory.getFactory( - mContext).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory() + .getMetricsFeatureProvider(); mKeyguardManager = (KeyguardManager) mContext.getSystemService( Context.KEYGUARD_SERVICE); } diff --git a/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java b/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java index f00a32703c8..9daa43d0a70 100644 --- a/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java +++ b/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java @@ -38,7 +38,7 @@ public class BrandedAccountPreferenceController extends BasePreferenceController public BrandedAccountPreferenceController(Context context, String key) { super(context, key); - mAccountFeatureProvider = FeatureFactory.getFactory(mContext).getAccountFeatureProvider(); + mAccountFeatureProvider = FeatureFactory.getFeatureFactory().getAccountFeatureProvider(); mAccounts = mAccountFeatureProvider.getAccounts(mContext); } diff --git a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java index 55b38afd0a8..6fe3ca4521b 100644 --- a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java +++ b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java @@ -46,8 +46,8 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.development.DevelopmentSettingsEnabler; - import com.android.settingslib.utils.StringUtil; + import com.google.android.setupcompat.util.WizardManagerHelper; public class BuildNumberPreferenceController extends BasePreferenceController implements @@ -70,7 +70,7 @@ public class BuildNumberPreferenceController extends BasePreferenceController im public BuildNumberPreferenceController(Context context, String key) { super(context, key); mUm = (UserManager) context.getSystemService(Context.USER_SERVICE); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } public void setHost(InstrumentedPreferenceFragment fragment) { @@ -241,7 +241,7 @@ public class BuildNumberPreferenceController extends BasePreferenceController im Toast.LENGTH_LONG); mDevHitToast.show(); - FeatureFactory.getFactory(mContext).getSearchFeatureProvider().sendPreIndexIntent(mContext); + FeatureFactory.getFeatureFactory().getSearchFeatureProvider().sendPreIndexIntent(mContext); } @VisibleForTesting diff --git a/src/com/android/settings/deviceinfo/StorageWizardFormatSlow.java b/src/com/android/settings/deviceinfo/StorageWizardFormatSlow.java index 79f97de8514..b59d1696927 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardFormatSlow.java +++ b/src/com/android/settings/deviceinfo/StorageWizardFormatSlow.java @@ -57,7 +57,7 @@ public class StorageWizardFormatSlow extends StorageWizardBase { @Override public void onNavigateBack(View view) { - FeatureFactory.getFactory(this).getMetricsFeatureProvider().action(this, + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider().action(this, SettingsEnums.ACTION_STORAGE_BENCHMARK_SLOW_ABORT); final Intent intent = new Intent(this, StorageWizardInit.class); @@ -69,11 +69,11 @@ public class StorageWizardFormatSlow extends StorageWizardBase { public void onNavigateNext(View view) { if (view != null) { // User made an explicit choice to continue when slow - FeatureFactory.getFactory(this).getMetricsFeatureProvider().action(this, + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider().action(this, SettingsEnums.ACTION_STORAGE_BENCHMARK_SLOW_CONTINUE); } else { // User made an implicit choice to continue when fast - FeatureFactory.getFactory(this).getMetricsFeatureProvider().action(this, + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider().action(this, SettingsEnums.ACTION_STORAGE_BENCHMARK_FAST_CONTINUE); } diff --git a/src/com/android/settings/deviceinfo/StorageWizardInit.java b/src/com/android/settings/deviceinfo/StorageWizardInit.java index 8d049836b6b..b912ffe4958 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardInit.java +++ b/src/com/android/settings/deviceinfo/StorageWizardInit.java @@ -133,7 +133,7 @@ public class StorageWizardInit extends StorageWizardBase { public void onNavigateExternal(View view) { if (view != null) { // User made an explicit choice for external - FeatureFactory.getFactory(this).getMetricsFeatureProvider().action(this, + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider().action(this, SettingsEnums.ACTION_STORAGE_INIT_EXTERNAL); } StorageWizardFormatConfirm.showPublic(this, mDisk.getId()); @@ -142,7 +142,7 @@ public class StorageWizardInit extends StorageWizardBase { public void onNavigateInternal(View view) { if (view != null) { // User made an explicit choice for internal - FeatureFactory.getFactory(this).getMetricsFeatureProvider().action(this, + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider().action(this, SettingsEnums.ACTION_STORAGE_INIT_INTERNAL); } StorageWizardFormatConfirm.showPrivate(this, mDisk.getId()); diff --git a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java index f65dd24ed25..ce17418e694 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java +++ b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java @@ -82,7 +82,7 @@ public class StorageWizardMigrateConfirm extends StorageWizardBase { @Override public void onNavigateBack(View view) { - FeatureFactory.getFactory(this).getMetricsFeatureProvider().action(this, + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider().action(this, SettingsEnums.ACTION_STORAGE_MIGRATE_LATER); if (mDisk != null) { @@ -142,7 +142,7 @@ public class StorageWizardMigrateConfirm extends StorageWizardBase { return; } - FeatureFactory.getFactory(this).getMetricsFeatureProvider().action(this, + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider().action(this, SettingsEnums.ACTION_STORAGE_MIGRATE_NOW); final Intent intent = new Intent(this, StorageWizardMigrateProgress.class); diff --git a/src/com/android/settings/deviceinfo/batteryinfo/BatteryFirstUseDatePreferenceController.java b/src/com/android/settings/deviceinfo/batteryinfo/BatteryFirstUseDatePreferenceController.java index 6c7a743ed12..0b750996a28 100644 --- a/src/com/android/settings/deviceinfo/batteryinfo/BatteryFirstUseDatePreferenceController.java +++ b/src/com/android/settings/deviceinfo/batteryinfo/BatteryFirstUseDatePreferenceController.java @@ -38,8 +38,8 @@ public class BatteryFirstUseDatePreferenceController extends BasePreferenceContr public BatteryFirstUseDatePreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); - mBatterySettingsFeatureProvider = FeatureFactory.getFactory( - context).getBatterySettingsFeatureProvider(); + mBatterySettingsFeatureProvider = FeatureFactory.getFeatureFactory() + .getBatterySettingsFeatureProvider(); mBatteryManager = mContext.getSystemService(BatteryManager.class); } diff --git a/src/com/android/settings/deviceinfo/batteryinfo/BatteryManufactureDatePreferenceController.java b/src/com/android/settings/deviceinfo/batteryinfo/BatteryManufactureDatePreferenceController.java index ff54c77052b..15d6b287b8d 100644 --- a/src/com/android/settings/deviceinfo/batteryinfo/BatteryManufactureDatePreferenceController.java +++ b/src/com/android/settings/deviceinfo/batteryinfo/BatteryManufactureDatePreferenceController.java @@ -38,8 +38,8 @@ public class BatteryManufactureDatePreferenceController extends BasePreferenceCo public BatteryManufactureDatePreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); - mBatterySettingsFeatureProvider = FeatureFactory.getFactory( - context).getBatterySettingsFeatureProvider(); + mBatterySettingsFeatureProvider = FeatureFactory.getFeatureFactory() + .getBatterySettingsFeatureProvider(); mBatteryManager = mContext.getSystemService(BatteryManager.class); } diff --git a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java index 84d88e34f81..b98fbda0a82 100644 --- a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java +++ b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java @@ -50,7 +50,7 @@ public class AutomaticStorageManagementSwitchPreferenceController extends public AutomaticStorageManagementSwitchPreferenceController(Context context, String key) { super(context, key); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } public AutomaticStorageManagementSwitchPreferenceController setFragmentManager( diff --git a/src/com/android/settings/deviceinfo/storage/ManageStoragePreferenceController.java b/src/com/android/settings/deviceinfo/storage/ManageStoragePreferenceController.java index 9613b5590fa..442531bae26 100644 --- a/src/com/android/settings/deviceinfo/storage/ManageStoragePreferenceController.java +++ b/src/com/android/settings/deviceinfo/storage/ManageStoragePreferenceController.java @@ -71,7 +71,7 @@ public class ManageStoragePreferenceController extends BasePreferenceController } final MetricsFeatureProvider metricsFeatureProvider = - FeatureFactory.getFactory(mContext).getMetricsFeatureProvider(); + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); metricsFeatureProvider.action(mContext, SettingsEnums.STORAGE_FREE_UP_SPACE_NOW); final Intent intent = new Intent(StorageManager.ACTION_MANAGE_STORAGE); diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java index d2471b77c3b..a57cd5b26f0 100644 --- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java +++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java @@ -151,7 +151,7 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle mVolume = volume; mSvp = svp; mIsWorkProfile = isWorkProfile; - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); mUserId = getCurrentUserId(); mIsDocumentsPrefShown = isDocumentsPrefShown(); mStorageCacheHelper = new StorageCacheHelper(mContext, mUserId); diff --git a/src/com/android/settings/display/AdaptiveSleepPreferenceController.java b/src/com/android/settings/display/AdaptiveSleepPreferenceController.java index b21c6ac32ef..725b956a60b 100644 --- a/src/com/android/settings/display/AdaptiveSleepPreferenceController.java +++ b/src/com/android/settings/display/AdaptiveSleepPreferenceController.java @@ -62,7 +62,7 @@ public class AdaptiveSleepPreferenceController { public AdaptiveSleepPreferenceController(Context context, RestrictionUtils restrictionUtils) { mContext = context; mRestrictionUtils = restrictionUtils; - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); mPrivacyManager = SensorPrivacyManager.getInstance(context); mPowerManager = context.getSystemService(PowerManager.class); mPackageManager = context.getPackageManager(); diff --git a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java index a5b0aeb42f2..71d431a0496 100644 --- a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java +++ b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java @@ -45,7 +45,7 @@ public class AmbientDisplayNotificationsPreferenceController extends public AmbientDisplayNotificationsPreferenceController(Context context, String key) { super(context, key); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } /** diff --git a/src/com/android/settings/display/AutoRotatePreferenceController.java b/src/com/android/settings/display/AutoRotatePreferenceController.java index 90423fbea7c..f16cbfb7d13 100644 --- a/src/com/android/settings/display/AutoRotatePreferenceController.java +++ b/src/com/android/settings/display/AutoRotatePreferenceController.java @@ -39,7 +39,7 @@ public class AutoRotatePreferenceController extends TogglePreferenceController i public AutoRotatePreferenceController(Context context, String key) { super(context, key); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } @Override diff --git a/src/com/android/settings/display/AutoRotateSwitchBarController.java b/src/com/android/settings/display/AutoRotateSwitchBarController.java index d76104aef7f..93420b04493 100644 --- a/src/com/android/settings/display/AutoRotateSwitchBarController.java +++ b/src/com/android/settings/display/AutoRotateSwitchBarController.java @@ -39,7 +39,7 @@ public class AutoRotateSwitchBarController extends SettingsMainSwitchPreferenceC public AutoRotateSwitchBarController(Context context, String key) { super(context, key); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } @Override diff --git a/src/com/android/settings/display/BatteryPercentagePreferenceController.java b/src/com/android/settings/display/BatteryPercentagePreferenceController.java index 74624e88f90..22915eeaf61 100644 --- a/src/com/android/settings/display/BatteryPercentagePreferenceController.java +++ b/src/com/android/settings/display/BatteryPercentagePreferenceController.java @@ -79,7 +79,7 @@ public class BatteryPercentagePreferenceController extends BasePreferenceControl boolean showPercentage = (Boolean) newValue; Settings.System.putInt(mContext.getContentResolver(), SHOW_BATTERY_PERCENT, showPercentage ? 1 : 0); - FeatureFactory.getFactory(mContext).getMetricsFeatureProvider() + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider() .action(mContext, SettingsEnums.OPEN_BATTERY_PERCENTAGE, showPercentage); return true; } diff --git a/src/com/android/settings/display/ControlsPrivacyPreferenceController.java b/src/com/android/settings/display/ControlsPrivacyPreferenceController.java index 5b5b900800d..b9a2bfa84f6 100644 --- a/src/com/android/settings/display/ControlsPrivacyPreferenceController.java +++ b/src/com/android/settings/display/ControlsPrivacyPreferenceController.java @@ -88,7 +88,7 @@ public class ControlsPrivacyPreferenceController extends TogglePreferenceControl } private boolean isSecure() { - final LockPatternUtils utils = FeatureFactory.getFactory(mContext) + final LockPatternUtils utils = FeatureFactory.getFeatureFactory() .getSecurityFeatureProvider() .getLockPatternUtils(mContext); final int userId = UserHandle.myUserId(); diff --git a/src/com/android/settings/display/DeviceStateAutoRotateSettingController.java b/src/com/android/settings/display/DeviceStateAutoRotateSettingController.java index beefc054cd0..69b34b0f3ff 100644 --- a/src/com/android/settings/display/DeviceStateAutoRotateSettingController.java +++ b/src/com/android/settings/display/DeviceStateAutoRotateSettingController.java @@ -67,7 +67,7 @@ public class DeviceStateAutoRotateSettingController extends TogglePreferenceCont public DeviceStateAutoRotateSettingController(Context context, int deviceState, String deviceStateDescription, int order) { this(context, deviceState, deviceStateDescription, order, - FeatureFactory.getFactory(context).getMetricsFeatureProvider()); + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider()); } void init(Lifecycle lifecycle) { diff --git a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java index d0d482246c7..c94f44331dc 100644 --- a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java +++ b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java @@ -47,7 +47,7 @@ public class NightDisplayActivationPreferenceController extends mColorDisplayManager = context.getSystemService(ColorDisplayManager.class); mTimeFormatter = new NightDisplayTimeFormatter(context); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } @Override diff --git a/src/com/android/settings/display/ScreenTimeoutSettings.java b/src/com/android/settings/display/ScreenTimeoutSettings.java index 5221b169716..fb6ddb84199 100644 --- a/src/com/android/settings/display/ScreenTimeoutSettings.java +++ b/src/com/android/settings/display/ScreenTimeoutSettings.java @@ -106,7 +106,7 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment implements public ScreenTimeoutSettings() { super(); - mMetricsFeatureProvider = FeatureFactory.getFactory(getContext()) + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory() .getMetricsFeatureProvider(); } diff --git a/src/com/android/settings/display/SmartAutoRotateController.java b/src/com/android/settings/display/SmartAutoRotateController.java index 768a6c10cbb..b5e3af223fd 100644 --- a/src/com/android/settings/display/SmartAutoRotateController.java +++ b/src/com/android/settings/display/SmartAutoRotateController.java @@ -81,7 +81,7 @@ public class SmartAutoRotateController extends TogglePreferenceController implem public SmartAutoRotateController(Context context, String preferenceKey) { super(context, preferenceKey); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); mPrivacyManager = SensorPrivacyManager.getInstance(context); mPowerManager = context.getSystemService(PowerManager.class); mDeviceStateAutoRotateSettingsManager = DeviceStateRotationLockSettingsManager.getInstance( diff --git a/src/com/android/settings/display/SmartAutoRotatePreferenceController.java b/src/com/android/settings/display/SmartAutoRotatePreferenceController.java index 3747f0636f0..311068f910e 100644 --- a/src/com/android/settings/display/SmartAutoRotatePreferenceController.java +++ b/src/com/android/settings/display/SmartAutoRotatePreferenceController.java @@ -79,7 +79,7 @@ public class SmartAutoRotatePreferenceController extends TogglePreferenceControl super(context, preferenceKey); mPrivacyManager = SensorPrivacyManager.getInstance(context); mPowerManager = context.getSystemService(PowerManager.class); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } @Override diff --git a/src/com/android/settings/display/ThemePreferenceController.java b/src/com/android/settings/display/ThemePreferenceController.java index 1dbf87f698b..25c6b691a79 100644 --- a/src/com/android/settings/display/ThemePreferenceController.java +++ b/src/com/android/settings/display/ThemePreferenceController.java @@ -59,7 +59,7 @@ public class ThemePreferenceController extends AbstractPreferenceController impl super(context); mOverlayService = overlayManager; mPackageManager = context.getPackageManager(); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } @Override diff --git a/src/com/android/settings/display/TwilightLocationPreferenceController.java b/src/com/android/settings/display/TwilightLocationPreferenceController.java index af9304787b8..9e35fc666c3 100644 --- a/src/com/android/settings/display/TwilightLocationPreferenceController.java +++ b/src/com/android/settings/display/TwilightLocationPreferenceController.java @@ -39,7 +39,7 @@ public class TwilightLocationPreferenceController extends BasePreferenceControll public TwilightLocationPreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); mLocationManager = context.getSystemService(LocationManager.class); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } @Override diff --git a/src/com/android/settings/display/WalletPrivacyPreferenceController.java b/src/com/android/settings/display/WalletPrivacyPreferenceController.java index f40e8386952..77fa0796152 100644 --- a/src/com/android/settings/display/WalletPrivacyPreferenceController.java +++ b/src/com/android/settings/display/WalletPrivacyPreferenceController.java @@ -89,7 +89,7 @@ public class WalletPrivacyPreferenceController extends TogglePreferenceControlle } private boolean isSecure() { - final LockPatternUtils utils = FeatureFactory.getFactory(mContext) + final LockPatternUtils utils = FeatureFactory.getFeatureFactory() .getSecurityFeatureProvider() .getLockPatternUtils(mContext); int userId = UserHandle.myUserId(); diff --git a/src/com/android/settings/display/darkmode/DarkModeActivationPreferenceController.java b/src/com/android/settings/display/darkmode/DarkModeActivationPreferenceController.java index 66ab2d37fa3..eac714bf5c3 100644 --- a/src/com/android/settings/display/darkmode/DarkModeActivationPreferenceController.java +++ b/src/com/android/settings/display/darkmode/DarkModeActivationPreferenceController.java @@ -47,7 +47,7 @@ public class DarkModeActivationPreferenceController extends BasePreferenceContro super(context, preferenceKey); mUiModeManager = context.getSystemService(UiModeManager.class); mFormat = new TimeFormatter(context); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } public DarkModeActivationPreferenceController(Context context, String preferenceKey, diff --git a/src/com/android/settings/dream/DreamPickerController.java b/src/com/android/settings/dream/DreamPickerController.java index d7003e62d38..3eb1fb1f5e0 100644 --- a/src/com/android/settings/dream/DreamPickerController.java +++ b/src/com/android/settings/dream/DreamPickerController.java @@ -61,7 +61,7 @@ public class DreamPickerController extends BasePreferenceController { mBackend = backend; mDreamInfos = mBackend.getDreamInfos(); mActiveDream = getActiveDreamInfo(mDreamInfos); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } @Override diff --git a/src/com/android/settings/emergency/MoreSettingsPreferenceController.java b/src/com/android/settings/emergency/MoreSettingsPreferenceController.java index d945b2134e4..4771f5ac956 100644 --- a/src/com/android/settings/emergency/MoreSettingsPreferenceController.java +++ b/src/com/android/settings/emergency/MoreSettingsPreferenceController.java @@ -111,7 +111,7 @@ public class MoreSettingsPreferenceController extends BasePreferenceController i @Override public void onClick(View v) { - FeatureFactory.getFactory(mContext).getMetricsFeatureProvider() + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider() .logClickedPreference(mPreference, getMetricsCategory()); final Intent intent = new Intent(mIntent) .addCategory(Intent.CATEGORY_LAUNCHER) diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java index 41ead68b623..b443773b6cd 100644 --- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java @@ -270,7 +270,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements mExecutor.execute(() -> { String packageName = getLoggingPackageName(getContext(), mBatteryOptimizeUtils.getPackageName()); - FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider() + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider() .action( getContext(), SettingsEnums.OPEN_APP_BATTERY_USAGE, @@ -456,7 +456,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements mExecutor.execute(() -> { String packageName = getLoggingPackageName(getContext(), mBatteryOptimizeUtils.getPackageName()); - FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider() + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider() .action( /* attribution */ SettingsEnums.OPEN_APP_BATTERY_USAGE, /* action */ finalMetricCategory, diff --git a/src/com/android/settings/fuelgauge/HighPowerDetail.java b/src/com/android/settings/fuelgauge/HighPowerDetail.java index f3a188fce7e..dc9150a0652 100644 --- a/src/com/android/settings/fuelgauge/HighPowerDetail.java +++ b/src/com/android/settings/fuelgauge/HighPowerDetail.java @@ -155,7 +155,7 @@ public class HighPowerDetail extends InstrumentedDialogFragment implements OnCli static void logSpecialPermissionChange(boolean allowlist, String packageName, Context context) { int logCategory = allowlist ? SettingsEnums.APP_SPECIAL_PERMISSION_BATTERY_DENY : SettingsEnums.APP_SPECIAL_PERMISSION_BATTERY_ALLOW; - FeatureFactory.getFactory(context).getMetricsFeatureProvider().action(context, logCategory, + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider().action(context, logCategory, packageName); } diff --git a/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java b/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java index d43a488ad01..e17119f26fc 100644 --- a/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java +++ b/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java @@ -86,7 +86,7 @@ public class RestrictAppPreferenceController extends BasePreferenceController { // start fragment RestrictedAppDetails.startRestrictedAppDetails(mPreferenceFragment, mAppInfos); - FeatureFactory.getFactory(mContext).getMetricsFeatureProvider() + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider() .action(mContext, SettingsEnums.OPEN_APP_RESTRICTED_LIST); return true; } diff --git a/src/com/android/settings/fuelgauge/RestrictedAppDetails.java b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java index 77eaa23ea5c..8cc59d0018c 100644 --- a/src/com/android/settings/fuelgauge/RestrictedAppDetails.java +++ b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java @@ -105,7 +105,7 @@ public class RestrictedAppDetails extends DashboardFragment implements mBatteryUtils = BatteryUtils.getInstance(context); mBatteryDatabaseManager = BatteryDatabaseManager.getInstance(context); mMetricsFeatureProvider = - FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider(); + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); refreshUi(); } diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettings.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettings.java index 1a7fdaf1bd7..2d841bd0964 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettings.java +++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettings.java @@ -180,7 +180,7 @@ public class BatterySaverScheduleSettings extends RadioButtonPickerFragment { && mSaverPercentage == currentSaverPercentage) { return; } - FeatureFactory.getFactory(mContext).getMetricsFeatureProvider() + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider() .action(SettingsEnums.FUELGAUGE_BATTERY_SAVER, SettingsEnums.FIELD_BATTERY_SAVER_SCHEDULE_TYPE, SettingsEnums.FIELD_BATTERY_SAVER_PERCENTAGE_VALUE, diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java index b041003a337..1a0ca4e6d99 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java @@ -66,7 +66,7 @@ public class BatteryTipPreferenceController extends BasePreferenceController { public BatteryTipPreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); mBatteryTipMap = new HashMap<>(); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); mNeedUpdate = true; } diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/BatteryTipAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/BatteryTipAction.java index 0ae2c14bf88..65aa07634ef 100644 --- a/src/com/android/settings/fuelgauge/batterytip/actions/BatteryTipAction.java +++ b/src/com/android/settings/fuelgauge/batterytip/actions/BatteryTipAction.java @@ -30,7 +30,7 @@ public abstract class BatteryTipAction { public BatteryTipAction(Context context) { mContext = context; - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } /** diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java index b7e1885ce52..66520438c38 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java @@ -156,7 +156,7 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll mActivity = activity; mIs24HourFormat = DateFormat.is24HourFormat(context); mMetricsFeatureProvider = - FeatureFactory.getFactory(mContext).getMetricsFeatureProvider(); + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); if (lifecycle != null) { lifecycle.addObserver(this); } diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java index b262dee93ab..a3b73df3aec 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java +++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java @@ -101,7 +101,7 @@ public class BatteryUsageBreakdownController extends BasePreferenceController mActivity = activity; mFragment = fragment; mMetricsFeatureProvider = - FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); if (lifecycle != null) { lifecycle.addObserver(this); } diff --git a/src/com/android/settings/gestures/DoubleTapPowerSettings.java b/src/com/android/settings/gestures/DoubleTapPowerSettings.java index 1ca6ea5ce7c..577758df396 100644 --- a/src/com/android/settings/gestures/DoubleTapPowerSettings.java +++ b/src/com/android/settings/gestures/DoubleTapPowerSettings.java @@ -39,7 +39,7 @@ public class DoubleTapPowerSettings extends DashboardFragment { public void onAttach(Context context) { super.onAttach(context); SuggestionFeatureProvider suggestionFeatureProvider = - FeatureFactory.getFactory(context).getSuggestionFeatureProvider(); + FeatureFactory.getFeatureFactory().getSuggestionFeatureProvider(); SharedPreferences prefs = suggestionFeatureProvider.getSharedPrefs(context); prefs.edit().putBoolean(PREF_KEY_SUGGESTION_COMPLETE, true).apply(); } diff --git a/src/com/android/settings/gestures/DoubleTapScreenSettings.java b/src/com/android/settings/gestures/DoubleTapScreenSettings.java index 975913016f6..5eea3d6803d 100644 --- a/src/com/android/settings/gestures/DoubleTapScreenSettings.java +++ b/src/com/android/settings/gestures/DoubleTapScreenSettings.java @@ -40,7 +40,7 @@ public class DoubleTapScreenSettings extends DashboardFragment { public void onAttach(Context context) { super.onAttach(context); SuggestionFeatureProvider suggestionFeatureProvider = - FeatureFactory.getFactory(context).getSuggestionFeatureProvider(); + FeatureFactory.getFeatureFactory().getSuggestionFeatureProvider(); SharedPreferences prefs = suggestionFeatureProvider.getSharedPrefs(context); prefs.edit().putBoolean(PREF_KEY_SUGGESTION_COMPLETE, true).apply(); diff --git a/src/com/android/settings/gestures/DoubleTwistGestureSettings.java b/src/com/android/settings/gestures/DoubleTwistGestureSettings.java index 9f2e9e786c2..2785483320d 100644 --- a/src/com/android/settings/gestures/DoubleTwistGestureSettings.java +++ b/src/com/android/settings/gestures/DoubleTwistGestureSettings.java @@ -43,7 +43,7 @@ public class DoubleTwistGestureSettings extends DashboardFragment { public void onAttach(Context context) { super.onAttach(context); SuggestionFeatureProvider suggestionFeatureProvider = - FeatureFactory.getFactory(context).getSuggestionFeatureProvider(); + FeatureFactory.getFeatureFactory().getSuggestionFeatureProvider(); SharedPreferences prefs = suggestionFeatureProvider.getSharedPrefs(context); prefs.edit().putBoolean(PREF_KEY_SUGGESTION_COMPLETE, true).apply(); } diff --git a/src/com/android/settings/gestures/PickupGestureSettings.java b/src/com/android/settings/gestures/PickupGestureSettings.java index 2a28ed34cd7..bfda405b463 100644 --- a/src/com/android/settings/gestures/PickupGestureSettings.java +++ b/src/com/android/settings/gestures/PickupGestureSettings.java @@ -40,7 +40,7 @@ public class PickupGestureSettings extends DashboardFragment { public void onAttach(Context context) { super.onAttach(context); SuggestionFeatureProvider suggestionFeatureProvider = - FeatureFactory.getFactory(context).getSuggestionFeatureProvider(); + FeatureFactory.getFeatureFactory().getSuggestionFeatureProvider(); SharedPreferences prefs = suggestionFeatureProvider.getSharedPrefs(context); prefs.edit().putBoolean(PREF_KEY_SUGGESTION_COMPLETE, true).apply(); diff --git a/src/com/android/settings/gestures/SwipeToNotificationSettings.java b/src/com/android/settings/gestures/SwipeToNotificationSettings.java index f3d00080460..953603a86ae 100644 --- a/src/com/android/settings/gestures/SwipeToNotificationSettings.java +++ b/src/com/android/settings/gestures/SwipeToNotificationSettings.java @@ -39,7 +39,7 @@ public class SwipeToNotificationSettings extends DashboardFragment { public void onAttach(Context context) { super.onAttach(context); SuggestionFeatureProvider suggestionFeatureProvider = - FeatureFactory.getFactory(context).getSuggestionFeatureProvider(); + FeatureFactory.getFeatureFactory().getSuggestionFeatureProvider(); SharedPreferences prefs = suggestionFeatureProvider.getSharedPrefs(context); prefs.edit().putBoolean(PREF_KEY_SUGGESTION_COMPLETE, true).apply(); } diff --git a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java index 875f71b1b3c..c40212b7e01 100644 --- a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java +++ b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java @@ -116,7 +116,7 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i super.onAttach(context); SuggestionFeatureProvider suggestionFeatureProvider = - FeatureFactory.getFactory(context).getSuggestionFeatureProvider(); + FeatureFactory.getFeatureFactory().getSuggestionFeatureProvider(); SharedPreferences prefs = suggestionFeatureProvider.getSharedPrefs(context); prefs.edit().putBoolean(PREF_KEY_SUGGESTION_COMPLETE, true).apply(); diff --git a/src/com/android/settings/gestures/TapScreenGestureSettings.java b/src/com/android/settings/gestures/TapScreenGestureSettings.java index 98439d608f1..773ef0ef68d 100644 --- a/src/com/android/settings/gestures/TapScreenGestureSettings.java +++ b/src/com/android/settings/gestures/TapScreenGestureSettings.java @@ -39,7 +39,7 @@ public class TapScreenGestureSettings extends DashboardFragment { public void onAttach(Context context) { super.onAttach(context); SuggestionFeatureProvider suggestionFeatureProvider = - FeatureFactory.getFactory(context).getSuggestionFeatureProvider(); + FeatureFactory.getFeatureFactory().getSuggestionFeatureProvider(); SharedPreferences prefs = suggestionFeatureProvider.getSharedPrefs(context); prefs.edit().putBoolean(PREF_KEY_SUGGESTION_COMPLETE, true).apply(); diff --git a/src/com/android/settings/homepage/SettingsHomepageActivity.java b/src/com/android/settings/homepage/SettingsHomepageActivity.java index 829a89c6f03..533fbe73c24 100644 --- a/src/com/android/settings/homepage/SettingsHomepageActivity.java +++ b/src/com/android/settings/homepage/SettingsHomepageActivity.java @@ -340,12 +340,12 @@ public class SettingsHomepageActivity extends FragmentActivity implements private void initSearchBarView() { final Toolbar toolbar = findViewById(R.id.search_action_bar); - FeatureFactory.getFactory(this).getSearchFeatureProvider() + FeatureFactory.getFeatureFactory().getSearchFeatureProvider() .initSearchToolbar(this /* activity */, toolbar, SettingsEnums.SETTINGS_HOMEPAGE); if (mIsEmbeddingActivityEnabled) { final Toolbar toolbarTwoPaneVersion = findViewById(R.id.search_action_bar_two_pane); - FeatureFactory.getFactory(this).getSearchFeatureProvider() + FeatureFactory.getFeatureFactory().getSearchFeatureProvider() .initSearchToolbar(this /* activity */, toolbarTwoPaneVersion, SettingsEnums.SETTINGS_HOMEPAGE); } @@ -383,7 +383,7 @@ public class SettingsHomepageActivity extends FragmentActivity implements } private void showSuggestionFragment(boolean scrollNeeded) { - final Class fragmentClass = FeatureFactory.getFactory(this) + final Class fragmentClass = FeatureFactory.getFeatureFactory() .getSuggestionFeatureProvider().getContextualSuggestionFragment(); if (fragmentClass == null) { return; diff --git a/src/com/android/settings/homepage/TopLevelSettings.java b/src/com/android/settings/homepage/TopLevelSettings.java index ace667fbeb3..d1fa7601322 100644 --- a/src/com/android/settings/homepage/TopLevelSettings.java +++ b/src/com/android/settings/homepage/TopLevelSettings.java @@ -178,7 +178,7 @@ public class TopLevelSettings extends DashboardFragment implements SplitLayoutLi public void onStart() { if (mFirstStarted) { mFirstStarted = false; - FeatureFactory.getFactory(getContext()).getSearchFeatureProvider().sendPreIndexIntent( + FeatureFactory.getFeatureFactory().getSearchFeatureProvider().sendPreIndexIntent( getContext()); } else if (mIsEmbeddingActivityEnabled && isOnlyOneActivityInTask() && !isActivityEmbedded()) { diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java b/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java index e4a644cf780..0cda62d805e 100644 --- a/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java +++ b/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java @@ -158,7 +158,7 @@ public class ContextualCardLoader extends AsyncLoaderCompat if (!CardContentProvider.DELETE_CARD_URI.equals(mNotifyUri)) { final MetricsFeatureProvider metricsFeatureProvider = - FeatureFactory.getFactory(mContext).getMetricsFeatureProvider(); + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); metricsFeatureProvider.action(mContext, SettingsEnums.ACTION_CONTEXTUAL_CARD_NOT_SHOW, @@ -178,7 +178,7 @@ public class ContextualCardLoader extends AsyncLoaderCompat @VisibleForTesting Cursor getContextualCardsFromProvider() { final ContextualCardFeatureProvider cardFeatureProvider = - FeatureFactory.getFactory(mContext).getContextualCardFeatureProvider(mContext); + FeatureFactory.getFeatureFactory().getContextualCardFeatureProvider(mContext); return cardFeatureProvider.getContextualCards(); } diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java b/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java index f5d0e667756..8b8b33f4b6a 100644 --- a/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java +++ b/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java @@ -235,7 +235,7 @@ public class ContextualCardManager implements ContextualCardLoader.CardContentLo final List cardsToKeep = getCardsToKeep(cards); final MetricsFeatureProvider metricsFeatureProvider = - FeatureFactory.getFactory(mContext).getMetricsFeatureProvider(); + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); //navigate back to the homepage, screen rotate or after card dismissal if (!mIsFirstLaunch) { diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java b/src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java index fb879bacc5a..a66e066343a 100644 --- a/src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java +++ b/src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java @@ -66,7 +66,7 @@ public class ContextualCardsFragment extends InstrumentedFragment implements super.onCreate(savedInstanceState); final Context context = getContext(); if (savedInstanceState == null) { - FeatureFactory.getFactory(context).getSlicesFeatureProvider().newUiSession(); + FeatureFactory.getFeatureFactory().getSlicesFeatureProvider().newUiSession(); BluetoothUpdateWorker.initLocalBtManager(getContext()); } mContextualCardManager = new ContextualCardManager(context, getSettingsLifecycle(), @@ -154,7 +154,7 @@ public class ContextualCardsFragment extends InstrumentedFragment implements private void resetSession(Context context) { sRestartLoaderNeeded = true; unregisterScreenOffReceiver(); - FeatureFactory.getFactory(context).getSlicesFeatureProvider().newUiSession(); + FeatureFactory.getFeatureFactory().getSlicesFeatureProvider().newUiSession(); } /** diff --git a/src/com/android/settings/homepage/contextualcards/EligibleCardChecker.java b/src/com/android/settings/homepage/contextualcards/EligibleCardChecker.java index f98d7955218..fb7ab897638 100644 --- a/src/com/android/settings/homepage/contextualcards/EligibleCardChecker.java +++ b/src/com/android/settings/homepage/contextualcards/EligibleCardChecker.java @@ -56,7 +56,7 @@ public class EligibleCardChecker implements Callable { public ContextualCard call() { final long startTime = System.currentTimeMillis(); final MetricsFeatureProvider metricsFeatureProvider = - FeatureFactory.getFactory(mContext).getMetricsFeatureProvider(); + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); ContextualCard result; if (isCardEligibleToDisplay(mCard)) { diff --git a/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRenderer.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRenderer.java index ccfb7320657..732ec7351af 100644 --- a/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRenderer.java +++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRenderer.java @@ -61,8 +61,8 @@ public class ConditionContextualCardRenderer implements ContextualCardRenderer { public void bindView(RecyclerView.ViewHolder holder, ContextualCard contextualCard) { final ConditionalCardHolder view = (ConditionalCardHolder) holder; final ConditionalContextualCard card = (ConditionalContextualCard) contextualCard; - final MetricsFeatureProvider metricsFeatureProvider = FeatureFactory.getFactory( - mContext).getMetricsFeatureProvider(); + final MetricsFeatureProvider metricsFeatureProvider = + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); metricsFeatureProvider.visible(mContext, SettingsEnums.SETTINGS_HOMEPAGE, card.getMetricsConstant(), 0); diff --git a/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardRenderer.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardRenderer.java index 2944cc88686..83f7ede237b 100644 --- a/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardRenderer.java +++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardRenderer.java @@ -50,8 +50,8 @@ public class ConditionFooterContextualCardRenderer implements ContextualCardRend @Override public void bindView(RecyclerView.ViewHolder holder, ContextualCard card) { - final MetricsFeatureProvider metricsFeatureProvider = FeatureFactory.getFactory( - mContext).getMetricsFeatureProvider(); + final MetricsFeatureProvider metricsFeatureProvider = + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); holder.itemView.setOnClickListener(v -> { metricsFeatureProvider.action(SettingsEnums.PAGE_UNKNOWN, SettingsEnums.ACTION_SETTINGS_CONDITION_EXPAND, diff --git a/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRenderer.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRenderer.java index 6fba85edbef..25a444f1624 100644 --- a/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRenderer.java +++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRenderer.java @@ -56,8 +56,8 @@ public class ConditionHeaderContextualCardRenderer implements ContextualCardRend final ConditionHeaderContextualCard headerCard = (ConditionHeaderContextualCard) contextualCard; final ConditionHeaderCardHolder view = (ConditionHeaderCardHolder) holder; - final MetricsFeatureProvider metricsFeatureProvider = FeatureFactory.getFactory( - mContext).getMetricsFeatureProvider(); + final MetricsFeatureProvider metricsFeatureProvider = + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); view.icons.removeAllViews(); headerCard.getConditionalCards().forEach(card -> { final ImageView icon = (ImageView) LayoutInflater.from(mContext).inflate( diff --git a/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardController.java b/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardController.java index 1ddb935cc7d..b0061fa8557 100644 --- a/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardController.java +++ b/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardController.java @@ -64,7 +64,7 @@ public class LegacySuggestionContextualCardController implements ContextualCardC return; } final ComponentName suggestionServiceComponent = - FeatureFactory.getFactory(mContext).getSuggestionFeatureProvider() + FeatureFactory.getFeatureFactory().getSuggestionFeatureProvider() .getSuggestionServiceComponent(); mSuggestionController = new SuggestionController( mContext, suggestionServiceComponent, this /* listener */); diff --git a/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSlice.java b/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSlice.java index 96924e40b3b..974af9fef4e 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSlice.java +++ b/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSlice.java @@ -74,7 +74,7 @@ public class DarkThemeSlice implements CustomSliceable { @Override public Slice getSlice() { - final long currentUiSession = FeatureFactory.getFactory(mContext) + final long currentUiSession = FeatureFactory.getFeatureFactory() .getSlicesFeatureProvider().getUiSessionToken(); if (currentUiSession != sActiveUiSession) { sActiveUiSession = currentUiSession; diff --git a/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardController.java b/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardController.java index ced3f8d5055..b348d3a536b 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardController.java +++ b/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardController.java @@ -69,13 +69,13 @@ public class SliceContextualCardController implements ContextualCardController { public void onDismissed(ContextualCard card) { ThreadUtils.postOnBackgroundThread(() -> { final ContextualCardFeatureProvider cardFeatureProvider = - FeatureFactory.getFactory(mContext).getContextualCardFeatureProvider(mContext); + FeatureFactory.getFeatureFactory().getContextualCardFeatureProvider(mContext); cardFeatureProvider.markCardAsDismissed(mContext, card.getName()); }); showFeedbackDialog(card); final MetricsFeatureProvider metricsFeatureProvider = - FeatureFactory.getFactory(mContext).getMetricsFeatureProvider(); + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); metricsFeatureProvider.action(mContext, SettingsEnums.ACTION_CONTEXTUAL_CARD_DISMISS, diff --git a/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelper.java b/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelper.java index fd60959ab39..ff3f0fde753 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelper.java +++ b/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelper.java @@ -57,7 +57,7 @@ class SliceFullCardRendererHelper { eventInfo.actionType, cardHolder.getAdapterPosition()); final MetricsFeatureProvider metricsFeatureProvider = - FeatureFactory.getFactory(mContext).getMetricsFeatureProvider(); + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); metricsFeatureProvider.action(mContext, SettingsEnums.ACTION_CONTEXTUAL_CARD_CLICK, log); diff --git a/src/com/android/settings/homepage/contextualcards/slices/SliceHalfCardRendererHelper.java b/src/com/android/settings/homepage/contextualcards/slices/SliceHalfCardRendererHelper.java index f7745423fb4..c881232c679 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/SliceHalfCardRendererHelper.java +++ b/src/com/android/settings/homepage/contextualcards/slices/SliceHalfCardRendererHelper.java @@ -69,7 +69,7 @@ class SliceHalfCardRendererHelper { EventInfo.ACTION_TYPE_CONTENT, view.getAdapterPosition()); final MetricsFeatureProvider metricsFeatureProvider = - FeatureFactory.getFactory(mContext).getMetricsFeatureProvider(); + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); metricsFeatureProvider.action(mContext, SettingsEnums.ACTION_CONTEXTUAL_CARD_CLICK, log); diff --git a/src/com/android/settings/inputmethod/ModifierKeysPickerDialogFragment.java b/src/com/android/settings/inputmethod/ModifierKeysPickerDialogFragment.java index 28ead8919af..fa7b372d709 100644 --- a/src/com/android/settings/inputmethod/ModifierKeysPickerDialogFragment.java +++ b/src/com/android/settings/inputmethod/ModifierKeysPickerDialogFragment.java @@ -94,8 +94,8 @@ public class ModifierKeysPickerDialogFragment extends DialogFragment { super.onCreateDialog(savedInstanceState); mActivity = getActivity(); - mMetricsFeatureProvider = FeatureFactory.getFactory(mActivity).getMetricsFeatureProvider(); - FeatureFactory featureFactory = FeatureFactory.getFactory(mActivity); + FeatureFactory featureFactory = FeatureFactory.getFeatureFactory(); + mMetricsFeatureProvider = featureFactory.getMetricsFeatureProvider(); mFeatureProvider = featureFactory.getKeyboardSettingsFeatureProvider(); InputManager inputManager = mActivity.getSystemService(InputManager.class); mKeyDefaultName = getArguments().getString(DEFAULT_KEY); diff --git a/src/com/android/settings/inputmethod/ModifierKeysPreferenceController.java b/src/com/android/settings/inputmethod/ModifierKeysPreferenceController.java index 77def483795..5a5b69e4a16 100644 --- a/src/com/android/settings/inputmethod/ModifierKeysPreferenceController.java +++ b/src/com/android/settings/inputmethod/ModifierKeysPreferenceController.java @@ -90,7 +90,7 @@ public class ModifierKeysPreferenceController extends BasePreferenceController { mIm = context.getSystemService(InputManager.class); Objects.requireNonNull(mIm, "InputManager service cannot be null"); KeyboardSettingsFeatureProvider featureProvider = - FeatureFactory.getFactory(context).getKeyboardSettingsFeatureProvider(); + FeatureFactory.getFeatureFactory().getKeyboardSettingsFeatureProvider(); mDrawable = featureProvider.getActionKeyIcon(context); } diff --git a/src/com/android/settings/inputmethod/ModifierKeysResetDialogFragment.java b/src/com/android/settings/inputmethod/ModifierKeysResetDialogFragment.java index fea6e65e777..d49fbd1ceae 100644 --- a/src/com/android/settings/inputmethod/ModifierKeysResetDialogFragment.java +++ b/src/com/android/settings/inputmethod/ModifierKeysResetDialogFragment.java @@ -57,7 +57,7 @@ public class ModifierKeysResetDialogFragment extends DialogFragment { super.onCreateDialog(savedInstanceState); Activity activity = getActivity(); - mMetricsFeatureProvider = FeatureFactory.getFactory(activity).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); InputManager inputManager = activity.getSystemService(InputManager.class); View dialoglayout = LayoutInflater.from(activity).inflate(R.layout.modifier_key_reset_dialog, null); diff --git a/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerController.java b/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerController.java index 65b1c62040b..879f1341f19 100644 --- a/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerController.java +++ b/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerController.java @@ -65,7 +65,7 @@ public class NewKeyboardLayoutPickerController extends BasePreferenceController mIm = context.getSystemService(InputManager.class); mInputDeviceId = -1; mPreferenceMap = new HashMap<>(); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } public void initialize(Fragment parent) { diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java index 289d7c186a9..0b69df5929a 100644 --- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java @@ -107,7 +107,7 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment (SwitchPreference) mKeyboardAssistanceCategory.findPreference( SHOW_VIRTUAL_KEYBOARD_SWITCH)); - FeatureFactory featureFactory = FeatureFactory.getFactory(getContext()); + FeatureFactory featureFactory = FeatureFactory.getFeatureFactory(); mMetricsFeatureProvider = featureFactory.getMetricsFeatureProvider(); mFeatureProvider = featureFactory.getKeyboardSettingsFeatureProvider(); mSupportsFirmwareUpdate = mFeatureProvider.supportsFirmwareUpdate(); diff --git a/src/com/android/settings/inputmethod/TouchGesturesButtonPreferenceController.java b/src/com/android/settings/inputmethod/TouchGesturesButtonPreferenceController.java index f0ee1fd252f..648a3e62f03 100644 --- a/src/com/android/settings/inputmethod/TouchGesturesButtonPreferenceController.java +++ b/src/com/android/settings/inputmethod/TouchGesturesButtonPreferenceController.java @@ -40,7 +40,7 @@ public class TouchGesturesButtonPreferenceController extends BasePreferenceContr public TouchGesturesButtonPreferenceController(Context context, String key) { super(context, key); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } public void setFragment(Fragment parent) { diff --git a/src/com/android/settings/inputmethod/TrackpadBottomPreferenceController.java b/src/com/android/settings/inputmethod/TrackpadBottomPreferenceController.java index 1cf1f6f9e75..d410a1ba4d8 100644 --- a/src/com/android/settings/inputmethod/TrackpadBottomPreferenceController.java +++ b/src/com/android/settings/inputmethod/TrackpadBottomPreferenceController.java @@ -31,7 +31,7 @@ public class TrackpadBottomPreferenceController extends TogglePreferenceControll public TrackpadBottomPreferenceController(Context context, String key) { super(context, key); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } @Override diff --git a/src/com/android/settings/inputmethod/TrackpadGoBackPreferenceController.java b/src/com/android/settings/inputmethod/TrackpadGoBackPreferenceController.java index 11d7cf3db07..36fb0c07c8f 100644 --- a/src/com/android/settings/inputmethod/TrackpadGoBackPreferenceController.java +++ b/src/com/android/settings/inputmethod/TrackpadGoBackPreferenceController.java @@ -33,7 +33,7 @@ public class TrackpadGoBackPreferenceController extends TogglePreferenceControll public TrackpadGoBackPreferenceController(Context context, String key) { super(context, key); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } @Override diff --git a/src/com/android/settings/inputmethod/TrackpadGoHomePreferenceController.java b/src/com/android/settings/inputmethod/TrackpadGoHomePreferenceController.java index 5027e2f678d..dbc706ee2f3 100644 --- a/src/com/android/settings/inputmethod/TrackpadGoHomePreferenceController.java +++ b/src/com/android/settings/inputmethod/TrackpadGoHomePreferenceController.java @@ -33,7 +33,7 @@ public class TrackpadGoHomePreferenceController extends TogglePreferenceControll public TrackpadGoHomePreferenceController(Context context, String key) { super(context, key); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } @Override diff --git a/src/com/android/settings/inputmethod/TrackpadNotificationsPreferenceController.java b/src/com/android/settings/inputmethod/TrackpadNotificationsPreferenceController.java index 0fb28d72cd9..d430e4d4c76 100644 --- a/src/com/android/settings/inputmethod/TrackpadNotificationsPreferenceController.java +++ b/src/com/android/settings/inputmethod/TrackpadNotificationsPreferenceController.java @@ -33,7 +33,7 @@ public class TrackpadNotificationsPreferenceController extends TogglePreferenceC public TrackpadNotificationsPreferenceController(Context context, String key) { super(context, key); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } @Override diff --git a/src/com/android/settings/inputmethod/TrackpadPointerSpeedPreferenceController.java b/src/com/android/settings/inputmethod/TrackpadPointerSpeedPreferenceController.java index 58b477244de..d024546a394 100644 --- a/src/com/android/settings/inputmethod/TrackpadPointerSpeedPreferenceController.java +++ b/src/com/android/settings/inputmethod/TrackpadPointerSpeedPreferenceController.java @@ -34,7 +34,7 @@ public class TrackpadPointerSpeedPreferenceController extends SliderPreferenceCo public TrackpadPointerSpeedPreferenceController(Context context, String key) { super(context, key); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } @Override diff --git a/src/com/android/settings/inputmethod/TrackpadRecentAppsPreferenceController.java b/src/com/android/settings/inputmethod/TrackpadRecentAppsPreferenceController.java index 878cbe3fc4e..44a56e72ab1 100644 --- a/src/com/android/settings/inputmethod/TrackpadRecentAppsPreferenceController.java +++ b/src/com/android/settings/inputmethod/TrackpadRecentAppsPreferenceController.java @@ -33,7 +33,7 @@ public class TrackpadRecentAppsPreferenceController extends TogglePreferenceCont public TrackpadRecentAppsPreferenceController(Context context, String key) { super(context, key); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } @Override diff --git a/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceController.java b/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceController.java index 2b74c74686a..042126da549 100644 --- a/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceController.java +++ b/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceController.java @@ -31,7 +31,7 @@ public class TrackpadReverseScrollingPreferenceController extends TogglePreferen public TrackpadReverseScrollingPreferenceController(Context context, String key) { super(context, key); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } @Override diff --git a/src/com/android/settings/inputmethod/TrackpadSwitchAppsPreferenceController.java b/src/com/android/settings/inputmethod/TrackpadSwitchAppsPreferenceController.java index cfca856b894..2b11411c186 100644 --- a/src/com/android/settings/inputmethod/TrackpadSwitchAppsPreferenceController.java +++ b/src/com/android/settings/inputmethod/TrackpadSwitchAppsPreferenceController.java @@ -33,7 +33,7 @@ public class TrackpadSwitchAppsPreferenceController extends TogglePreferenceCont public TrackpadSwitchAppsPreferenceController(Context context, String key) { super(context, key); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } @Override diff --git a/src/com/android/settings/inputmethod/TrackpadTapToClickPreferenceController.java b/src/com/android/settings/inputmethod/TrackpadTapToClickPreferenceController.java index 9ee446ba304..f78c81e2b93 100644 --- a/src/com/android/settings/inputmethod/TrackpadTapToClickPreferenceController.java +++ b/src/com/android/settings/inputmethod/TrackpadTapToClickPreferenceController.java @@ -31,7 +31,7 @@ public class TrackpadTapToClickPreferenceController extends TogglePreferenceCont public TrackpadTapToClickPreferenceController(Context context, String key) { super(context, key); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } @Override diff --git a/src/com/android/settings/inputmethod/UserDictionarySettings.java b/src/com/android/settings/inputmethod/UserDictionarySettings.java index f51629d2b7a..27a62a982bf 100644 --- a/src/com/android/settings/inputmethod/UserDictionarySettings.java +++ b/src/com/android/settings/inputmethod/UserDictionarySettings.java @@ -76,7 +76,7 @@ public class UserDictionarySettings extends ListFragment implements Instrumentab super.onCreate(savedInstanceState); mVisibilityLoggerMixin = new VisibilityLoggerMixin(getMetricsCategory(), - FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider()); + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider()); final Intent intent = getActivity().getIntent(); final String localeFromIntent = diff --git a/src/com/android/settings/language/PhoneLanguagePreferenceController.java b/src/com/android/settings/language/PhoneLanguagePreferenceController.java index 0d5aa379ac7..3a382e40be3 100644 --- a/src/com/android/settings/language/PhoneLanguagePreferenceController.java +++ b/src/com/android/settings/language/PhoneLanguagePreferenceController.java @@ -49,7 +49,7 @@ public class PhoneLanguagePreferenceController extends BasePreferenceController if (preference == null) { return; } - final String localeNames = FeatureFactory.getFactory(mContext) + final String localeNames = FeatureFactory.getFeatureFactory() .getLocaleFeatureProvider().getLocaleNames(); preference.setSummary(localeNames); } diff --git a/src/com/android/settings/localepicker/AppLocalePickerActivity.java b/src/com/android/settings/localepicker/AppLocalePickerActivity.java index dc04d6a684d..1d2759091d8 100644 --- a/src/com/android/settings/localepicker/AppLocalePickerActivity.java +++ b/src/com/android/settings/localepicker/AppLocalePickerActivity.java @@ -89,7 +89,7 @@ public class AppLocalePickerActivity extends SettingsBaseActivity setTitle(R.string.app_locale_picker_title); getActionBar().setDisplayHomeAsUpEnabled(true); - mMetricsFeatureProvider = FeatureFactory.getFactory(this).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); mLocalePickerWithRegion = LocalePickerWithRegion.createLanguagePicker( this, diff --git a/src/com/android/settings/localepicker/LocaleDialogFragment.java b/src/com/android/settings/localepicker/LocaleDialogFragment.java index 6c37e380c77..52ee63db81c 100644 --- a/src/com/android/settings/localepicker/LocaleDialogFragment.java +++ b/src/com/android/settings/localepicker/LocaleDialogFragment.java @@ -185,8 +185,8 @@ public class LocaleDialogFragment extends InstrumentedDialogFragment { Bundle arguments = dialogFragment.getArguments(); mDialogType = arguments.getInt(ARG_DIALOG_TYPE); mLocaleInfo = (LocaleStore.LocaleInfo) arguments.getSerializable(ARG_TARGET_LOCALE); - mMetricsFeatureProvider = FeatureFactory.getFactory( - mContext).getMetricsFeatureProvider(); + mMetricsFeatureProvider = + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); mParent = parentFragment; } diff --git a/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java b/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java index 6054c599411..af9ad85527d 100644 --- a/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java +++ b/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java @@ -231,7 +231,7 @@ class LocaleDragAndDropAdapter } if (fromPosition != toPosition) { - FeatureFactory.getFactory(mContext).getMetricsFeatureProvider() + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider() .action(mContext, SettingsEnums.ACTION_REORDER_LANGUAGE, mDragLocale.getLocale().toLanguageTag() + " move to " + toPosition); } @@ -274,7 +274,7 @@ class LocaleDragAndDropAdapter for (int i = itemCount - 1; i >= 0; i--) { localeInfo = mFeedItemList.get(i); if (localeInfo.getChecked()) { - FeatureFactory.getFactory(mContext).getMetricsFeatureProvider() + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider() .action(mContext, SettingsEnums.ACTION_REMOVE_LANGUAGE, localeInfo.getLocale().toLanguageTag()); mFeedItemList.remove(i); diff --git a/src/com/android/settings/localepicker/LocaleHelperPreferenceController.java b/src/com/android/settings/localepicker/LocaleHelperPreferenceController.java index 1227683ce73..b962b9e8d46 100644 --- a/src/com/android/settings/localepicker/LocaleHelperPreferenceController.java +++ b/src/com/android/settings/localepicker/LocaleHelperPreferenceController.java @@ -43,7 +43,7 @@ public class LocaleHelperPreferenceController extends AbstractPreferenceControll public LocaleHelperPreferenceController(Context context) { super(context); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } @Override diff --git a/src/com/android/settings/localepicker/LocaleListEditor.java b/src/com/android/settings/localepicker/LocaleListEditor.java index 824a8fd4f84..934a048199d 100644 --- a/src/com/android/settings/localepicker/LocaleListEditor.java +++ b/src/com/android/settings/localepicker/LocaleListEditor.java @@ -513,7 +513,7 @@ public class LocaleListEditor extends RestrictedSettingsFragment implements View mAddLanguage.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider() + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider() .logSettingsTileClick(INDEX_KEY_ADD_LANGUAGE, getMetricsCategory()); final Intent intent = new Intent(getActivity(), diff --git a/src/com/android/settings/location/AppSettingsInjector.java b/src/com/android/settings/location/AppSettingsInjector.java index 7bea99931e2..e012b09d593 100644 --- a/src/com/android/settings/location/AppSettingsInjector.java +++ b/src/com/android/settings/location/AppSettingsInjector.java @@ -40,7 +40,7 @@ public class AppSettingsInjector extends SettingsInjector { public AppSettingsInjector(Context context, int metricsCategory) { super(context); mMetricsCategory = metricsCategory; - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } @Override diff --git a/src/com/android/settings/location/RecentLocationAccessSeeAllPreferenceController.java b/src/com/android/settings/location/RecentLocationAccessSeeAllPreferenceController.java index d6586673f89..998e6f3f541 100644 --- a/src/com/android/settings/location/RecentLocationAccessSeeAllPreferenceController.java +++ b/src/com/android/settings/location/RecentLocationAccessSeeAllPreferenceController.java @@ -57,7 +57,7 @@ public class RecentLocationAccessSeeAllPreferenceController : false; mRecentLocationAccesses = RecentAppOpsAccess.createForLocation(context); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } @Override diff --git a/src/com/android/settings/network/BluetoothWiFiResetPreferenceController.java b/src/com/android/settings/network/BluetoothWiFiResetPreferenceController.java index 6eb470b014d..f0f5d732c2a 100644 --- a/src/com/android/settings/network/BluetoothWiFiResetPreferenceController.java +++ b/src/com/android/settings/network/BluetoothWiFiResetPreferenceController.java @@ -111,7 +111,7 @@ public class BluetoothWiFiResetPreferenceController extends BasePreferenceContro } // User confirm the reset operation - MetricsFeatureProvider provider = FeatureFactory.getFactory(mContext) + MetricsFeatureProvider provider = FeatureFactory.getFeatureFactory() .getMetricsFeatureProvider(); provider.action(mContext, SettingsEnums.RESET_BLUETOOTH_WIFI_CONFIRM, true); diff --git a/src/com/android/settings/network/MobileNetworkRepository.java b/src/com/android/settings/network/MobileNetworkRepository.java index 7d88821d81f..5d6ad33d8c4 100644 --- a/src/com/android/settings/network/MobileNetworkRepository.java +++ b/src/com/android/settings/network/MobileNetworkRepository.java @@ -120,7 +120,7 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions private MobileNetworkRepository(Context context) { mContext = context; mMobileNetworkDatabase = MobileNetworkDatabase.getInstance(context); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_MOBILE_NETWORK_DB_CREATED); mSubscriptionManager = context.getSystemService(SubscriptionManager.class); mSubscriptionInfoDao = mMobileNetworkDatabase.mSubscriptionInfoDao(); diff --git a/src/com/android/settings/network/MobileNetworkSummaryController.java b/src/com/android/settings/network/MobileNetworkSummaryController.java index f924636463d..15c149410b3 100644 --- a/src/com/android/settings/network/MobileNetworkSummaryController.java +++ b/src/com/android/settings/network/MobileNetworkSummaryController.java @@ -84,7 +84,7 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController public MobileNetworkSummaryController(Context context, Lifecycle lifecycle, LifecycleOwner lifecycleOwner) { super(context); - mMetricsFeatureProvider = FeatureFactory.getFactory(mContext).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); mUserManager = context.getSystemService(UserManager.class); mLifecycleOwner = lifecycleOwner; mMobileNetworkRepository = MobileNetworkRepository.getInstance(context); diff --git a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java index 1304f5e5e8b..3b99777720a 100644 --- a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java +++ b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java @@ -188,7 +188,7 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat mEditText.getText().toString()); } - FeatureFactory.getFactory(context).getMetricsFeatureProvider().action(context, + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider().action(context, SettingsEnums.ACTION_PRIVATE_DNS_MODE, mMode); ConnectivitySettingsManager.setPrivateDnsMode(context, mMode); } diff --git a/src/com/android/settings/network/WifiSwitchPreferenceController.java b/src/com/android/settings/network/WifiSwitchPreferenceController.java index da69f4ff95a..8e6f4446cb2 100644 --- a/src/com/android/settings/network/WifiSwitchPreferenceController.java +++ b/src/com/android/settings/network/WifiSwitchPreferenceController.java @@ -91,7 +91,7 @@ public class WifiSwitchPreferenceController extends AbstractPreferenceController // Wi-Fi state, but WifiEnabler will enable the preference when the Wi-Fi state changes. if (mPreference != null && mIsChangeWifiStateAllowed) { mWifiEnabler = new WifiEnabler(mContext, new GenericSwitchController(mPreference), - FeatureFactory.getFactory(mContext).getMetricsFeatureProvider()); + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider()); } } diff --git a/src/com/android/settings/network/telephony/AutoDataSwitchPreferenceController.java b/src/com/android/settings/network/telephony/AutoDataSwitchPreferenceController.java index 1c20f5910bf..7ebd2d73417 100644 --- a/src/com/android/settings/network/telephony/AutoDataSwitchPreferenceController.java +++ b/src/com/android/settings/network/telephony/AutoDataSwitchPreferenceController.java @@ -75,7 +75,7 @@ public class AutoDataSwitchPreferenceController extends TelephonyTogglePreferenc public AutoDataSwitchPreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } void init(int subId) { diff --git a/src/com/android/settings/network/telephony/Enable2gPreferenceController.java b/src/com/android/settings/network/telephony/Enable2gPreferenceController.java index 106aa0238c7..765df512c2b 100644 --- a/src/com/android/settings/network/telephony/Enable2gPreferenceController.java +++ b/src/com/android/settings/network/telephony/Enable2gPreferenceController.java @@ -74,7 +74,7 @@ public class Enable2gPreferenceController extends TelephonyTogglePreferenceContr public Enable2gPreferenceController(Context context, String key) { super(context, key); mCarrierConfigCache = CarrierConfigCache.getInstance(context); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); mSubscriptionManager = context.getSystemService(SubscriptionManager.class); mRestrictedPreference = null; } diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java index 9d057dc55f7..861574f944d 100644 --- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java +++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java @@ -161,7 +161,7 @@ public class NetworkSelectSettings extends DashboardFragment { @Keep @VisibleForTesting protected MetricsFeatureProvider getMetricsFeatureProvider(Context context) { - return FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + return FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } @Keep diff --git a/src/com/android/settings/nfc/NfcForegroundPreferenceController.java b/src/com/android/settings/nfc/NfcForegroundPreferenceController.java index 611d3fcb56f..a4cad8734ec 100644 --- a/src/com/android/settings/nfc/NfcForegroundPreferenceController.java +++ b/src/com/android/settings/nfc/NfcForegroundPreferenceController.java @@ -43,7 +43,7 @@ public class NfcForegroundPreferenceController extends BasePreferenceController public NfcForegroundPreferenceController(Context context, String key) { super(context, key); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); mListValues = context.getResources().getStringArray(R.array.nfc_payment_favor_values); mListEntries = context.getResources().getStringArray(R.array.nfc_payment_favor); } diff --git a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java index 1ede911c3c4..f1857de34d0 100644 --- a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java +++ b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java @@ -84,7 +84,7 @@ public class LockScreenNotificationPreferenceController extends AbstractPreferen mWorkSettingKey = workSettingKey; mProfileUserId = Utils.getManagedProfileId(UserManager.get(context), UserHandle.myUserId()); - final LockPatternUtils utils = FeatureFactory.getFactory(context) + final LockPatternUtils utils = FeatureFactory.getFeatureFactory() .getSecurityFeatureProvider() .getLockPatternUtils(context); mSecure = utils.isSecure(UserHandle.myUserId()); @@ -278,7 +278,7 @@ public class LockScreenNotificationPreferenceController extends AbstractPreferen public static int getSummaryResource(Context context) { final boolean enabled = getLockscreenNotificationsEnabled(context); - final boolean secure = FeatureFactory.getFactory(context) + final boolean secure = FeatureFactory.getFeatureFactory() .getSecurityFeatureProvider() .getLockPatternUtils(context) .isSecure(UserHandle.myUserId()); diff --git a/src/com/android/settings/notification/RedactNotificationPreferenceController.java b/src/com/android/settings/notification/RedactNotificationPreferenceController.java index 0b9ad4413ce..4ebf08e0a43 100644 --- a/src/com/android/settings/notification/RedactNotificationPreferenceController.java +++ b/src/com/android/settings/notification/RedactNotificationPreferenceController.java @@ -130,7 +130,7 @@ public class RedactNotificationPreferenceController extends TogglePreferenceCont ? UserHandle.myUserId() : mProfileUserId; // hide if lockscreen isn't secure for this user - final LockPatternUtils utils = FeatureFactory.getFactory(mContext) + final LockPatternUtils utils = FeatureFactory.getFeatureFactory() .getSecurityFeatureProvider() .getLockPatternUtils(mContext); if (!utils.isSecure(userId)) { diff --git a/src/com/android/settings/notification/zen/AbstractZenModePreferenceController.java b/src/com/android/settings/notification/zen/AbstractZenModePreferenceController.java index 02e40157aa6..038196fd423 100644 --- a/src/com/android/settings/notification/zen/AbstractZenModePreferenceController.java +++ b/src/com/android/settings/notification/zen/AbstractZenModePreferenceController.java @@ -68,7 +68,7 @@ abstract public class AbstractZenModePreferenceController extends mNotificationManager = (NotificationManager) context.getSystemService( Context.NOTIFICATION_SERVICE); - final FeatureFactory featureFactory = FeatureFactory.getFactory(mContext); + final FeatureFactory featureFactory = FeatureFactory.getFeatureFactory(); mMetricsFeatureProvider = featureFactory.getMetricsFeatureProvider(); mBackend = ZenModeBackend.getInstance(context); } diff --git a/src/com/android/settings/notification/zen/ZenOnboardingActivity.java b/src/com/android/settings/notification/zen/ZenOnboardingActivity.java index b70088c0cbf..23c388bf5cd 100644 --- a/src/com/android/settings/notification/zen/ZenOnboardingActivity.java +++ b/src/com/android/settings/notification/zen/ZenOnboardingActivity.java @@ -180,7 +180,7 @@ public class ZenOnboardingActivity extends Activity { private static boolean withinShowTimeThreshold(Context context) { final SuggestionFeatureProvider featureProvider = - FeatureFactory.getFactory(context).getSuggestionFeatureProvider(); + FeatureFactory.getFeatureFactory().getSuggestionFeatureProvider(); final SharedPreferences prefs = featureProvider.getSharedPrefs(context); final long currentTimeMs = System.currentTimeMillis(); final long firstDisplayTimeMs; diff --git a/src/com/android/settings/overlay/FeatureFactory.kt b/src/com/android/settings/overlay/FeatureFactory.kt index 267166b0865..256acf4b921 100644 --- a/src/com/android/settings/overlay/FeatureFactory.kt +++ b/src/com/android/settings/overlay/FeatureFactory.kt @@ -170,16 +170,5 @@ abstract class FeatureFactory { _appContext = appContext _factory = factory } - - /** Returns a factory for creating feature controllers. */ - @Deprecated( - "Replace with featureFactory without Context", - ReplaceWith( - "featureFactory", - "com.android.settings.overlay.FeatureFactory.Companion.featureFactory", - ) - ) - @JvmStatic - fun getFactory(context: Context?): FeatureFactory = featureFactory } } diff --git a/src/com/android/settings/panel/PanelFragment.java b/src/com/android/settings/panel/PanelFragment.java index 5bc0cc8d636..159028369aa 100644 --- a/src/com/android/settings/panel/PanelFragment.java +++ b/src/com/android/settings/panel/PanelFragment.java @@ -221,7 +221,7 @@ public class PanelFragment extends Fragment { final String callingPackageName = arguments.getString(SettingsPanelActivity.KEY_CALLING_PACKAGE_NAME); - mPanel = FeatureFactory.getFactory(activity) + mPanel = FeatureFactory.getFeatureFactory() .getPanelFeatureProvider() .getPanel(activity, arguments); @@ -235,7 +235,7 @@ public class PanelFragment extends Fragment { getLifecycle().addObserver((LifecycleObserver) mPanel); } - mMetricsProvider = FeatureFactory.getFactory(activity).getMetricsFeatureProvider(); + mMetricsProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); updateProgressBar(); diff --git a/src/com/android/settings/panel/PanelSlicesAdapter.java b/src/com/android/settings/panel/PanelSlicesAdapter.java index 1bced76a6b7..a4bb7ccca31 100644 --- a/src/com/android/settings/panel/PanelSlicesAdapter.java +++ b/src/com/android/settings/panel/PanelSlicesAdapter.java @@ -148,7 +148,7 @@ public class PanelSlicesAdapter // Log Panel interaction sliceView.setOnSliceActionListener( ((eventInfo, sliceItem) -> { - FeatureFactory.getFactory(sliceView.getContext()) + FeatureFactory.getFeatureFactory() .getMetricsFeatureProvider() .action(0 /* attribution */, SettingsEnums.ACTION_PANEL_INTERACTION, diff --git a/src/com/android/settings/password/SetNewPasswordActivity.java b/src/com/android/settings/password/SetNewPasswordActivity.java index fc664eccde1..bb3c6dfbf64 100644 --- a/src/com/android/settings/password/SetNewPasswordActivity.java +++ b/src/com/android/settings/password/SetNewPasswordActivity.java @@ -180,7 +180,7 @@ public class SetNewPasswordActivity extends Activity implements SetNewPasswordCo : SettingsEnums.ACTION_SET_NEW_PARENT_PROFILE_PASSWORD; final MetricsFeatureProvider metricsProvider = - FeatureFactory.getFactory(this).getMetricsFeatureProvider(); + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); metricsProvider.action( metricsProvider.getAttribution(this), action, diff --git a/src/com/android/settings/regionalpreferences/NumberingSystemItemController.java b/src/com/android/settings/regionalpreferences/NumberingSystemItemController.java index 2a99e9925ea..a608fbf5735 100644 --- a/src/com/android/settings/regionalpreferences/NumberingSystemItemController.java +++ b/src/com/android/settings/regionalpreferences/NumberingSystemItemController.java @@ -64,7 +64,7 @@ public class NumberingSystemItemController extends BasePreferenceController { RegionalPreferencesEntriesFragment.ARG_KEY_REGIONAL_PREFERENCE, ""); mSelectedLanguage = argument.getString( NumberingSystemItemController.KEY_SELECTED_LANGUAGE, ""); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } /** diff --git a/src/com/android/settings/regionalpreferences/RegionalPreferenceListBasePreferenceController.java b/src/com/android/settings/regionalpreferences/RegionalPreferenceListBasePreferenceController.java index 432ce0e89e9..ac0e7ee8b27 100644 --- a/src/com/android/settings/regionalpreferences/RegionalPreferenceListBasePreferenceController.java +++ b/src/com/android/settings/regionalpreferences/RegionalPreferenceListBasePreferenceController.java @@ -16,11 +16,8 @@ package com.android.settings.regionalpreferences; -import android.app.settings.SettingsEnums; import android.content.Context; -import android.util.Log; -import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; @@ -38,7 +35,7 @@ public abstract class RegionalPreferenceListBasePreferenceController extends public RegionalPreferenceListBasePreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } @Override diff --git a/src/com/android/settings/search/SearchFeatureProvider.java b/src/com/android/settings/search/SearchFeatureProvider.java index cd096ec6e16..9262ba8cb7f 100644 --- a/src/com/android/settings/search/SearchFeatureProvider.java +++ b/src/com/android/settings/search/SearchFeatureProvider.java @@ -136,10 +136,10 @@ public interface SearchFeatureProvider { /** Start the search activity. */ private static void startSearchActivity( Context context, FragmentActivity activity, int pageId, Intent intent) { - FeatureFactory.getFactory(context).getSlicesFeatureProvider() + FeatureFactory.getFeatureFactory().getSlicesFeatureProvider() .indexSliceDataAsync(context); - FeatureFactory.getFactory(context).getMetricsFeatureProvider() + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider() .logSettingsTileClick(KEY_HOMEPAGE_SEARCH_BAR, pageId); final Bundle bundle = ActivityOptions.makeSceneTransitionAnimation(activity).toBundle(); diff --git a/src/com/android/settings/search/SearchResultTrampoline.java b/src/com/android/settings/search/SearchResultTrampoline.java index 6ba0338bfc9..f72b097b2ad 100644 --- a/src/com/android/settings/search/SearchResultTrampoline.java +++ b/src/com/android/settings/search/SearchResultTrampoline.java @@ -54,7 +54,7 @@ public class SearchResultTrampoline extends Activity { final ComponentName callingActivity = getCallingActivity(); // First make sure caller has privilege to launch a search result page. - FeatureFactory.getFactory(this) + FeatureFactory.getFeatureFactory() .getSearchFeatureProvider() .verifyLaunchSearchResultPageCaller(this, callingActivity); // Didn't crash, proceed and launch the result as a subsetting. @@ -141,7 +141,7 @@ public class SearchResultTrampoline extends Activity { private boolean isSettingsIntelligence(ComponentName callingActivity) { return callingActivity != null && TextUtils.equals( callingActivity.getPackageName(), - FeatureFactory.getFactory(this).getSearchFeatureProvider() + FeatureFactory.getFeatureFactory().getSearchFeatureProvider() .getSettingsIntelligencePkgName(this)); } } diff --git a/src/com/android/settings/search/actionbar/SearchMenuController.java b/src/com/android/settings/search/actionbar/SearchMenuController.java index 0482b00df94..a2613e1975f 100644 --- a/src/com/android/settings/search/actionbar/SearchMenuController.java +++ b/src/com/android/settings/search/actionbar/SearchMenuController.java @@ -91,7 +91,7 @@ public class SearchMenuController implements LifecycleObserver, OnCreateOptionsM searchItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); searchItem.setOnMenuItemClickListener(target -> { - final Intent intent = FeatureFactory.getFactory(activity) + final Intent intent = FeatureFactory.getFeatureFactory() .getSearchFeatureProvider() .buildSearchIntent(activity, mPageId); @@ -100,7 +100,7 @@ public class SearchMenuController implements LifecycleObserver, OnCreateOptionsM return true; } - FeatureFactory.getFactory(activity).getMetricsFeatureProvider() + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider() .action(activity, SettingsEnums.ACTION_SEARCH_RESULTS); mHost.startActivityForResult(intent, SearchFeatureProvider.REQUEST_CODE); return true; diff --git a/src/com/android/settings/security/ChangeScreenLockPreferenceController.java b/src/com/android/settings/security/ChangeScreenLockPreferenceController.java index 3870634f667..2fab6c8aa2e 100644 --- a/src/com/android/settings/security/ChangeScreenLockPreferenceController.java +++ b/src/com/android/settings/security/ChangeScreenLockPreferenceController.java @@ -56,12 +56,12 @@ public class ChangeScreenLockPreferenceController extends AbstractPreferenceCont public ChangeScreenLockPreferenceController(Context context, SettingsPreferenceFragment host) { super(context); mUm = (UserManager) context.getSystemService(Context.USER_SERVICE); - mLockPatternUtils = FeatureFactory.getFactory(context) + mLockPatternUtils = FeatureFactory.getFeatureFactory() .getSecurityFeatureProvider() .getLockPatternUtils(context); mHost = host; mProfileChallengeUserId = Utils.getManagedProfileId(mUm, mUserId); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); mScreenLockPreferenceDetailUtils = new ScreenLockPreferenceDetailsUtils(context); } diff --git a/src/com/android/settings/security/ConfirmSimDeletionPreferenceController.java b/src/com/android/settings/security/ConfirmSimDeletionPreferenceController.java index 2712a02fa1a..b6b3608f03a 100644 --- a/src/com/android/settings/security/ConfirmSimDeletionPreferenceController.java +++ b/src/com/android/settings/security/ConfirmSimDeletionPreferenceController.java @@ -48,7 +48,7 @@ public class ConfirmSimDeletionPreferenceController extends BasePreferenceContro mConfirmationDefaultOn = context.getResources() .getBoolean(R.bool.config_sim_deletion_confirmation_default_on); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); mUserManager = context.getSystemService(UserManager.class); mKeyguardManager = mContext.getSystemService(KeyguardManager.class); diff --git a/src/com/android/settings/security/LockUnificationPreferenceController.java b/src/com/android/settings/security/LockUnificationPreferenceController.java index d85d65b386e..e9931df1460 100644 --- a/src/com/android/settings/security/LockUnificationPreferenceController.java +++ b/src/com/android/settings/security/LockUnificationPreferenceController.java @@ -97,7 +97,7 @@ public class LockUnificationPreferenceController extends AbstractPreferenceContr mHost = host; mUm = context.getSystemService(UserManager.class); mDpm = context.getSystemService(DevicePolicyManager.class); - mLockPatternUtils = FeatureFactory.getFactory(context) + mLockPatternUtils = FeatureFactory.getFeatureFactory() .getSecurityFeatureProvider() .getLockPatternUtils(context); mProfileUserId = Utils.getManagedProfileId(mUm, MY_USER_ID); diff --git a/src/com/android/settings/security/ScreenLockPreferenceDetailsUtils.java b/src/com/android/settings/security/ScreenLockPreferenceDetailsUtils.java index 7de26353bf9..88477c364f1 100644 --- a/src/com/android/settings/security/ScreenLockPreferenceDetailsUtils.java +++ b/src/com/android/settings/security/ScreenLockPreferenceDetailsUtils.java @@ -50,7 +50,7 @@ public class ScreenLockPreferenceDetailsUtils { public ScreenLockPreferenceDetailsUtils(Context context) { mContext = context; mUm = context.getSystemService(UserManager.class); - mLockPatternUtils = FeatureFactory.getFactory(context) + mLockPatternUtils = FeatureFactory.getFeatureFactory() .getSecurityFeatureProvider() .getLockPatternUtils(context); mProfileChallengeUserId = Utils.getManagedProfileId(mUm, mUserId); diff --git a/src/com/android/settings/security/SecurityAdvancedSettings.java b/src/com/android/settings/security/SecurityAdvancedSettings.java index 23265a7d3f0..c29372caaf4 100644 --- a/src/com/android/settings/security/SecurityAdvancedSettings.java +++ b/src/com/android/settings/security/SecurityAdvancedSettings.java @@ -70,7 +70,7 @@ public class SecurityAdvancedSettings extends DashboardFragment { return CategoryKey.CATEGORY_SECURITY_ADVANCED_SETTINGS; } else { final SecuritySettingsFeatureProvider securitySettingsFeatureProvider = - FeatureFactory.getFactory(context).getSecuritySettingsFeatureProvider(); + FeatureFactory.getFeatureFactory().getSecuritySettingsFeatureProvider(); if (securitySettingsFeatureProvider.hasAlternativeSecuritySettingsFragment()) { return securitySettingsFeatureProvider.getAlternativeAdvancedSettingsCategoryKey(); diff --git a/src/com/android/settings/security/SecuritySettings.java b/src/com/android/settings/security/SecuritySettings.java index b30b54d4d4c..6d987f34c1f 100644 --- a/src/com/android/settings/security/SecuritySettings.java +++ b/src/com/android/settings/security/SecuritySettings.java @@ -127,7 +127,7 @@ public class SecuritySettings extends DashboardFragment { @Override protected boolean isPageSearchEnabled(Context context) { - return !FeatureFactory.getFactory(context).getSecuritySettingsFeatureProvider() + return !FeatureFactory.getFeatureFactory().getSecuritySettingsFeatureProvider() .hasAlternativeSecuritySettingsFragment() && !SafetyCenterManagerWrapper.get().isEnabled(context); } diff --git a/src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java b/src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java index f83a9095902..95ef5be62cb 100644 --- a/src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java +++ b/src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java @@ -32,7 +32,7 @@ public class TopLevelSecurityEntryPreferenceController extends BasePreferenceCon public TopLevelSecurityEntryPreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); - mSecuritySettingsFeatureProvider = FeatureFactory.getFactory(mContext) + mSecuritySettingsFeatureProvider = FeatureFactory.getFeatureFactory() .getSecuritySettingsFeatureProvider(); } diff --git a/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java b/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java index 4d65ae75fe9..3d64ca8c8ad 100644 --- a/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java +++ b/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java @@ -66,7 +66,7 @@ public class VisiblePatternProfilePreferenceController extends TogglePreferenceC Context context, Lifecycle lifecycle, String key) { super(context, key); mUm = (UserManager) context.getSystemService(Context.USER_SERVICE); - mLockPatternUtils = FeatureFactory.getFactory(context) + mLockPatternUtils = FeatureFactory.getFeatureFactory() .getSecurityFeatureProvider() .getLockPatternUtils(context); mProfileChallengeUserId = Utils.getManagedProfileId(mUm, mUserId); diff --git a/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java b/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java index 180ed990c5a..dd99e9f19fb 100644 --- a/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java +++ b/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java @@ -54,7 +54,7 @@ public class LockAfterTimeoutPreferenceController extends AbstractPreferenceCont mUserId = userId; mLockPatternUtils = lockPatternUtils; mDPM = (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE); - mTrustAgentManager = FeatureFactory.getFactory(context) + mTrustAgentManager = FeatureFactory.getFeatureFactory() .getSecurityFeatureProvider().getTrustAgentManager(); } diff --git a/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java b/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java index 67b0701fc6d..9836a24702e 100644 --- a/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java +++ b/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java @@ -44,7 +44,7 @@ public class PowerButtonInstantLockPreferenceController extends AbstractPreferen super(context); mUserId = userId; mLockPatternUtils = lockPatternUtils; - mTrustAgentManager = FeatureFactory.getFactory(context) + mTrustAgentManager = FeatureFactory.getFeatureFactory() .getSecurityFeatureProvider().getTrustAgentManager(); } diff --git a/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java b/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java index 8943878c290..82b25ef3503 100644 --- a/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java +++ b/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java @@ -37,7 +37,7 @@ public class ManageTrustAgentsPreferenceController extends BasePreferenceControl public ManageTrustAgentsPreferenceController(Context context, String key) { super(context, key); - final SecurityFeatureProvider securityFeatureProvider = FeatureFactory.getFactory(context) + final SecurityFeatureProvider securityFeatureProvider = FeatureFactory.getFeatureFactory() .getSecurityFeatureProvider(); mLockPatternUtils = securityFeatureProvider.getLockPatternUtils(context); mTrustAgentManager = securityFeatureProvider.getTrustAgentManager(); diff --git a/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java b/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java index 4f235e18d85..2ec90de9f8a 100644 --- a/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java +++ b/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java @@ -74,7 +74,7 @@ public class TrustAgentListPreferenceController extends AbstractPreferenceContro public TrustAgentListPreferenceController(Context context, SettingsPreferenceFragment host, Lifecycle lifecycle) { super(context); - final SecurityFeatureProvider provider = FeatureFactory.getFactory(context) + final SecurityFeatureProvider provider = FeatureFactory.getFeatureFactory() .getSecurityFeatureProvider(); mHost = host; mLockPatternUtils = provider.getLockPatternUtils(context); diff --git a/src/com/android/settings/security/trustagent/TrustAgentsPreferenceController.java b/src/com/android/settings/security/trustagent/TrustAgentsPreferenceController.java index 42688397f20..dcc6c22e86f 100644 --- a/src/com/android/settings/security/trustagent/TrustAgentsPreferenceController.java +++ b/src/com/android/settings/security/trustagent/TrustAgentsPreferenceController.java @@ -70,7 +70,7 @@ public class TrustAgentsPreferenceController extends BasePreferenceController mDevicePolicyManager = context.getSystemService(DevicePolicyManager.class); mIconDrawableFactory = IconDrawableFactory.newInstance(context); final SecurityFeatureProvider securityFeatureProvider = - FeatureFactory.getFactory(context).getSecurityFeatureProvider(); + FeatureFactory.getFeatureFactory().getSecurityFeatureProvider(); mTrustAgentManager = securityFeatureProvider.getTrustAgentManager(); mLockPatternUtils = securityFeatureProvider.getLockPatternUtils(context); mPackageManager = context.getPackageManager(); diff --git a/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java b/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java index bf953489be9..0d4ea76bcd2 100644 --- a/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java +++ b/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java @@ -83,7 +83,7 @@ public class CreateShortcutPreferenceController extends BasePreferenceController (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); mShortcutManager = context.getSystemService(ShortcutManager.class); mPackageManager = context.getPackageManager(); - mMetricsFeatureProvider = FeatureFactory.getFactory(context) + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory() .getMetricsFeatureProvider(); } diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java index e7b01857ded..d65b2d1f69c 100644 --- a/src/com/android/settings/sim/SimDialogActivity.java +++ b/src/com/android/settings/sim/SimDialogActivity.java @@ -90,7 +90,7 @@ public class SimDialogActivity extends FragmentActivity { } SimDialogProhibitService.supportDismiss(this); - mMetricsFeatureProvider = FeatureFactory.getFactory(this).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); getWindow().addSystemFlags( WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS); showOrUpdateDialog(); diff --git a/src/com/android/settings/slices/SettingsSliceProvider.java b/src/com/android/settings/slices/SettingsSliceProvider.java index ebf2104c29e..f9e00914fb1 100644 --- a/src/com/android/settings/slices/SettingsSliceProvider.java +++ b/src/com/android/settings/slices/SettingsSliceProvider.java @@ -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); diff --git a/src/com/android/settings/slices/SliceBroadcastReceiver.java b/src/com/android/settings/slices/SliceBroadcastReceiver.java index d3c7a4d7cc5..2c9853aca23 100644 --- a/src/com/android/settings/slices/SliceBroadcastReceiver.java +++ b/src/com/android/settings/slices/SliceBroadcastReceiver.java @@ -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, diff --git a/src/com/android/settings/slices/SliceDataConverter.java b/src/com/android/settings/slices/SliceDataConverter.java index db79009b9d0..f6828af3df0 100644 --- a/src/com/android/settings/slices/SliceDataConverter.java +++ b/src/com/android/settings/slices/SliceDataConverter.java @@ -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 getSliceData() { List sliceData = new ArrayList<>(); - final Collection bundles = FeatureFactory.getFactory(mContext) + final Collection bundles = FeatureFactory.getFeatureFactory() .getSearchFeatureProvider().getSearchIndexableResources().getProviderValues(); for (SearchIndexableData bundle : bundles) { diff --git a/src/com/android/settings/slices/SlicesDatabaseAccessor.java b/src/com/android/settings/slices/SlicesDatabaseAccessor.java index 93aade18810..b083b79afb1 100644 --- a/src/com/android/settings/slices/SlicesDatabaseAccessor.java +++ b/src/com/android/settings/slices/SlicesDatabaseAccessor.java @@ -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); } diff --git a/src/com/android/settings/slices/SlicesIndexer.java b/src/com/android/settings/slices/SlicesIndexer.java index 3e7f8005ef0..268f3f0218f 100644 --- a/src/com/android/settings/slices/SlicesIndexer.java +++ b/src/com/android/settings/slices/SlicesIndexer.java @@ -88,7 +88,7 @@ class SlicesIndexer implements Runnable { @VisibleForTesting List getSliceData() { - return FeatureFactory.getFactory(mContext) + return FeatureFactory.getFeatureFactory() .getSlicesFeatureProvider() .getSliceDataConverter(mContext) .getSliceData(); diff --git a/src/com/android/settings/survey/SurveyMixin.java b/src/com/android/settings/survey/SurveyMixin.java index 2f68de62194..0768e800415 100644 --- a/src/com/android/settings/survey/SurveyMixin.java +++ b/src/com/android/settings/survey/SurveyMixin.java @@ -54,7 +54,7 @@ public class SurveyMixin implements LifecycleObserver, OnResume { // guard against the activity not existing yet if (activity != null) { SurveyFeatureProvider provider = - FeatureFactory.getFactory(activity).getSurveyFeatureProvider(activity); + FeatureFactory.getFeatureFactory().getSurveyFeatureProvider(activity); if (provider != null) { provider.sendActivityIfAvailable(mName); } diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java index 6d0518a84bf..8ff0159fe4f 100644 --- a/src/com/android/settings/tts/TextToSpeechSettings.java +++ b/src/com/android/settings/tts/TextToSpeechSettings.java @@ -806,7 +806,7 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment } else { Log.e(TAG, "settingsIntent is null"); } - FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider() + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider() .logClickedPreference(p, getMetricsCategory()); } } diff --git a/src/com/android/settings/vpn2/AppManagementFragment.java b/src/com/android/settings/vpn2/AppManagementFragment.java index 7d17541fd95..1d5b3cc6d51 100644 --- a/src/com/android/settings/vpn2/AppManagementFragment.java +++ b/src/com/android/settings/vpn2/AppManagementFragment.java @@ -123,7 +123,7 @@ public class AppManagementFragment extends SettingsPreferenceFragment mPackageManager = getContext().getPackageManager(); mDevicePolicyManager = getContext().getSystemService(DevicePolicyManager.class); mVpnManager = getContext().getSystemService(VpnManager.class); - mFeatureProvider = FeatureFactory.getFactory(getContext()).getAdvancedVpnFeatureProvider(); + mFeatureProvider = FeatureFactory.getFeatureFactory().getAdvancedVpnFeatureProvider(); mPreferenceVersion = findPreference(KEY_VERSION); mPreferenceAlwaysOn = (RestrictedSwitchPreference) findPreference(KEY_ALWAYS_ON_VPN); diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java index f3ad4e2263c..0ee21b9e26e 100644 --- a/src/com/android/settings/vpn2/VpnSettings.java +++ b/src/com/android/settings/vpn2/VpnSettings.java @@ -129,7 +129,7 @@ public class VpnSettings extends RestrictedDashboardFragment implements mUserManager = (UserManager) getSystemService(Context.USER_SERVICE); mConnectivityManager = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); mVpnManager = (VpnManager) getSystemService(Context.VPN_MANAGEMENT_SERVICE); - mFeatureProvider = FeatureFactory.getFactory(getContext()).getAdvancedVpnFeatureProvider(); + mFeatureProvider = FeatureFactory.getFeatureFactory().getAdvancedVpnFeatureProvider(); mIsAdvancedVpnSupported = mFeatureProvider.isAdvancedVpnSupported(getContext()); mUnavailable = isUiRestricted(); diff --git a/src/com/android/settings/widget/EntityHeaderController.java b/src/com/android/settings/widget/EntityHeaderController.java index c56b36d4e88..bcd3f4be4f7 100644 --- a/src/com/android/settings/widget/EntityHeaderController.java +++ b/src/com/android/settings/widget/EntityHeaderController.java @@ -110,7 +110,7 @@ public class EntityHeaderController { mActivity = activity; mAppContext = activity.getApplicationContext(); mFragment = fragment; - mMetricsCategory = FeatureFactory.getFactory(mAppContext).getMetricsFeatureProvider() + mMetricsCategory = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider() .getMetricsCategory(fragment); if (header != null) { mHeader = header; @@ -327,7 +327,7 @@ public class EntityHeaderController { button.setVisibility(View.GONE); } else { button.setOnClickListener(v -> { - FeatureFactory.getFactory(mAppContext).getMetricsFeatureProvider() + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider() .action(SettingsEnums.PAGE_UNKNOWN, SettingsEnums.ACTION_OPEN_APP_NOTIFICATION_SETTING, mMetricsCategory, diff --git a/src/com/android/settings/widget/GenericSwitchController.java b/src/com/android/settings/widget/GenericSwitchController.java index 819907a71f3..c20f932b849 100644 --- a/src/com/android/settings/widget/GenericSwitchController.java +++ b/src/com/android/settings/widget/GenericSwitchController.java @@ -45,8 +45,7 @@ public class GenericSwitchController extends SwitchWidgetController implements private void setPreference(Preference preference) { mPreference = preference; - mMetricsFeatureProvider = - FeatureFactory.getFactory(preference.getContext()).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } @Override diff --git a/src/com/android/settings/widget/SettingsMainSwitchBar.java b/src/com/android/settings/widget/SettingsMainSwitchBar.java index 8b8a9bae494..ac2c136e8a1 100644 --- a/src/com/android/settings/widget/SettingsMainSwitchBar.java +++ b/src/com/android/settings/widget/SettingsMainSwitchBar.java @@ -68,7 +68,7 @@ public class SettingsMainSwitchBar extends MainSwitchBar { public SettingsMainSwitchBar(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); addOnSwitchChangeListener((switchView, isChecked) -> logMetrics(isChecked)); } diff --git a/src/com/android/settings/widget/SwitchBar.java b/src/com/android/settings/widget/SwitchBar.java index ad0294c1bea..6e5e834cc4a 100644 --- a/src/com/android/settings/widget/SwitchBar.java +++ b/src/com/android/settings/widget/SwitchBar.java @@ -161,7 +161,7 @@ public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedC // Default is hide setVisibility(View.GONE); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } // Override the performClick method to eliminate redundant click. diff --git a/src/com/android/settings/wifi/ChangeWifiStateDetails.java b/src/com/android/settings/wifi/ChangeWifiStateDetails.java index 9841615a690..96cbce3bf80 100644 --- a/src/com/android/settings/wifi/ChangeWifiStateDetails.java +++ b/src/com/android/settings/wifi/ChangeWifiStateDetails.java @@ -95,7 +95,7 @@ public class ChangeWifiStateDetails extends AppInfoWithHeader protected void logSpecialPermissionChange(boolean newState, String packageName) { int logCategory = newState ? SettingsEnums.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_ALLOW : SettingsEnums.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_DENY; - FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider().action(getContext(), + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider().action(getContext(), logCategory, packageName); } diff --git a/src/com/android/settings/wifi/ConfigureWifiEntryFragment.java b/src/com/android/settings/wifi/ConfigureWifiEntryFragment.java index 29451bfa738..652d318b4f9 100644 --- a/src/com/android/settings/wifi/ConfigureWifiEntryFragment.java +++ b/src/com/android/settings/wifi/ConfigureWifiEntryFragment.java @@ -232,7 +232,7 @@ public class ConfigureWifiEntryFragment extends InstrumentedFragment implements } }; - mNetworkDetailsTracker = FeatureFactory.getFactory(context) + mNetworkDetailsTracker = FeatureFactory.getFeatureFactory() .getWifiTrackerLibProvider() .createNetworkDetailsTracker( getSettingsLifecycle(), diff --git a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java index 65f305e249e..cf4bbcb51d9 100644 --- a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java +++ b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java @@ -112,7 +112,7 @@ public class NetworkRequestDialogFragment extends NetworkRequestDialogBaseFragme } }; final Context context = getContext(); - mWifiPickerTracker = FeatureFactory.getFactory(context) + mWifiPickerTracker = FeatureFactory.getFeatureFactory() .getWifiTrackerLibProvider() .createWifiPickerTracker(getSettingsLifecycle(), context, new Handler(Looper.getMainLooper()), diff --git a/src/com/android/settings/wifi/WifiConnectionPreferenceController.java b/src/com/android/settings/wifi/WifiConnectionPreferenceController.java index c55f3e126fb..05bd3bef95f 100644 --- a/src/com/android/settings/wifi/WifiConnectionPreferenceController.java +++ b/src/com/android/settings/wifi/WifiConnectionPreferenceController.java @@ -112,7 +112,7 @@ public class WifiConnectionPreferenceController extends AbstractPreferenceContro return SystemClock.elapsedRealtime(); } }; - mWifiPickerTracker = FeatureFactory.getFactory(context) + mWifiPickerTracker = FeatureFactory.getFeatureFactory() .getWifiTrackerLibProvider() .createWifiPickerTracker(lifecycle, context, new Handler(Looper.getMainLooper()), diff --git a/src/com/android/settings/wifi/WifiDialogActivity.java b/src/com/android/settings/wifi/WifiDialogActivity.java index e3e77e86000..124e7f0f83b 100644 --- a/src/com/android/settings/wifi/WifiDialogActivity.java +++ b/src/com/android/settings/wifi/WifiDialogActivity.java @@ -140,7 +140,7 @@ public class WifiDialogActivity extends ObservableActivity implements WifiDialog return SystemClock.elapsedRealtime(); } }; - mNetworkDetailsTracker = FeatureFactory.getFactory(this) + mNetworkDetailsTracker = FeatureFactory.getFeatureFactory() .getWifiTrackerLibProvider() .createNetworkDetailsTracker( getLifecycle(), diff --git a/src/com/android/settings/wifi/WifiPickerTrackerHelper.java b/src/com/android/settings/wifi/WifiPickerTrackerHelper.java index 3aa7b834638..4df3efab4a6 100644 --- a/src/com/android/settings/wifi/WifiPickerTrackerHelper.java +++ b/src/com/android/settings/wifi/WifiPickerTrackerHelper.java @@ -78,7 +78,7 @@ public class WifiPickerTrackerHelper implements LifecycleObserver { Process.THREAD_PRIORITY_BACKGROUND); mWorkerThread.start(); - mWifiPickerTracker = FeatureFactory.getFactory(context) + mWifiPickerTracker = FeatureFactory.getFeatureFactory() .getWifiTrackerLibProvider() .createWifiPickerTracker(lifecycle, context, new Handler(Looper.getMainLooper()), diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index c02f1d10c3d..2518de9bb81 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -294,7 +294,7 @@ public class WifiSettings extends RestrictedSettingsFragment mMainHandler = new Handler(Looper.getMainLooper()); mWorkerHandler = mWorkerThread.getThreadHandler(); - mWifiPickerTracker = FeatureFactory.getFactory(context) + mWifiPickerTracker = FeatureFactory.getFeatureFactory() .getWifiTrackerLibProvider() .createWifiPickerTracker(getSettingsLifecycle(), context, mMainHandler, mWorkerHandler, diff --git a/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java b/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java index 7878f5d81dc..b98d5cd108c 100644 --- a/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java +++ b/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java @@ -192,7 +192,7 @@ public class AddAppNetworksFragment extends InstrumentedFragment implements return SystemClock.elapsedRealtime(); } }; - mWifiPickerTracker = FeatureFactory.getFactory(mActivity.getApplicationContext()) + mWifiPickerTracker = FeatureFactory.getFeatureFactory() .getWifiTrackerLibProvider() .createWifiPickerTracker(getSettingsLifecycle(), mActivity, new Handler(Looper.getMainLooper()), diff --git a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java index dd0c20a4765..b638ce77c11 100644 --- a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java +++ b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java @@ -280,7 +280,7 @@ public class WifiNetworkDetailsFragment extends RestrictedDashboardFragment impl } }; - mNetworkDetailsTracker = FeatureFactory.getFactory(context) + mNetworkDetailsTracker = FeatureFactory.getFeatureFactory() .getWifiTrackerLibProvider() .createNetworkDetailsTracker( getSettingsLifecycle(), diff --git a/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java b/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java index 872c61af28c..479c81dafa1 100644 --- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java +++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java @@ -400,7 +400,7 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl } }; final Context context = getContext(); - mWifiPickerTracker = FeatureFactory.getFactory(context) + mWifiPickerTracker = FeatureFactory.getFeatureFactory() .getWifiTrackerLibProvider() .createWifiPickerTracker(getSettingsLifecycle(), context, new Handler(Looper.getMainLooper()), diff --git a/src/com/android/settings/wifi/repository/WifiHotspotRepository.java b/src/com/android/settings/wifi/repository/WifiHotspotRepository.java index af8eb474923..6140d714fab 100644 --- a/src/com/android/settings/wifi/repository/WifiHotspotRepository.java +++ b/src/com/android/settings/wifi/repository/WifiHotspotRepository.java @@ -657,6 +657,6 @@ public class WifiHotspotRepository { } private void log(String msg) { - FeatureFactory.getFactory(mAppContext).getWifiFeatureProvider().verboseLog(TAG, msg); + FeatureFactory.getFeatureFactory().getWifiFeatureProvider().verboseLog(TAG, msg); } } diff --git a/src/com/android/settings/wifi/slice/ContextualWifiSlice.java b/src/com/android/settings/wifi/slice/ContextualWifiSlice.java index 4806573bf1e..6b83f74f8bc 100644 --- a/src/com/android/settings/wifi/slice/ContextualWifiSlice.java +++ b/src/com/android/settings/wifi/slice/ContextualWifiSlice.java @@ -65,7 +65,7 @@ public class ContextualWifiSlice extends WifiSlice { @Override public Slice getSlice() { - final long currentUiSession = FeatureFactory.getFactory(mContext) + final long currentUiSession = FeatureFactory.getFeatureFactory() .getSlicesFeatureProvider().getUiSessionToken(); if (currentUiSession != sActiveUiSession) { sActiveUiSession = currentUiSession; diff --git a/src/com/android/settings/wifi/tether/WifiHotspotSecuritySettings.java b/src/com/android/settings/wifi/tether/WifiHotspotSecuritySettings.java index 0dc1605ae6f..9489e11879a 100644 --- a/src/com/android/settings/wifi/tether/WifiHotspotSecuritySettings.java +++ b/src/com/android/settings/wifi/tether/WifiHotspotSecuritySettings.java @@ -63,7 +63,7 @@ public class WifiHotspotSecuritySettings extends DashboardFragment implements } protected void loadViewModel() { - mWifiHotspotSecurityViewModel = FeatureFactory.getFactory(getContext()) + mWifiHotspotSecurityViewModel = FeatureFactory.getFeatureFactory() .getWifiFeatureProvider().getWifiHotspotSecurityViewModel(this); LiveData> viewItemListData = mWifiHotspotSecurityViewModel.getViewItemListData(); @@ -115,6 +115,6 @@ public class WifiHotspotSecuritySettings extends DashboardFragment implements } private void log(String msg) { - FeatureFactory.getFactory(getContext()).getWifiFeatureProvider().verboseLog(TAG, msg); + FeatureFactory.getFeatureFactory().getWifiFeatureProvider().verboseLog(TAG, msg); } } diff --git a/src/com/android/settings/wifi/tether/WifiHotspotSecurityViewModel.java b/src/com/android/settings/wifi/tether/WifiHotspotSecurityViewModel.java index 7c8554c8dc8..0f912a4efb9 100644 --- a/src/com/android/settings/wifi/tether/WifiHotspotSecurityViewModel.java +++ b/src/com/android/settings/wifi/tether/WifiHotspotSecurityViewModel.java @@ -65,7 +65,7 @@ public class WifiHotspotSecurityViewModel extends AndroidViewModel { mViewItemMap.put(SECURITY_TYPE_WPA2_PSK, new ViewItem(KEY_SECURITY_WPA2)); mViewItemMap.put(SECURITY_TYPE_OPEN, new ViewItem(KEY_SECURITY_NONE)); - mWifiHotspotRepository = FeatureFactory.getFactory(application).getWifiFeatureProvider() + mWifiHotspotRepository = FeatureFactory.getFeatureFactory().getWifiFeatureProvider() .getWifiHotspotRepository(); mWifiHotspotRepository.getSecurityType().observeForever(mSecurityTypeObserver); mWifiHotspotRepository.getSpeedType().observeForever(mSpeedTypeObserver); @@ -159,6 +159,6 @@ public class WifiHotspotSecurityViewModel extends AndroidViewModel { } private void log(String msg) { - FeatureFactory.getFactory(getApplication()).getWifiFeatureProvider().verboseLog(TAG, msg); + FeatureFactory.getFeatureFactory().getWifiFeatureProvider().verboseLog(TAG, msg); } } diff --git a/src/com/android/settings/wifi/tether/WifiHotspotSpeedSettings.java b/src/com/android/settings/wifi/tether/WifiHotspotSpeedSettings.java index a5e12d8f83a..08afde11fd7 100644 --- a/src/com/android/settings/wifi/tether/WifiHotspotSpeedSettings.java +++ b/src/com/android/settings/wifi/tether/WifiHotspotSpeedSettings.java @@ -77,7 +77,7 @@ public class WifiHotspotSpeedSettings extends DashboardFragment implements public void onCreate(Bundle icicle) { super.onCreate(icicle); loadPreferences(); - mWifiHotspotSpeedViewModel = FeatureFactory.getFactory(getContext()) + mWifiHotspotSpeedViewModel = FeatureFactory.getFeatureFactory() .getWifiFeatureProvider().getWifiHotspotSpeedViewModel(this); onSpeedInfoMapDataChanged(mWifiHotspotSpeedViewModel.getSpeedInfoMapData().getValue()); mWifiHotspotSpeedViewModel.getSpeedInfoMapData() @@ -138,6 +138,6 @@ public class WifiHotspotSpeedSettings extends DashboardFragment implements } private void log(String msg) { - FeatureFactory.getFactory(getContext()).getWifiFeatureProvider().verboseLog(TAG, msg); + FeatureFactory.getFeatureFactory().getWifiFeatureProvider().verboseLog(TAG, msg); } } diff --git a/src/com/android/settings/wifi/tether/WifiHotspotSpeedViewModel.java b/src/com/android/settings/wifi/tether/WifiHotspotSpeedViewModel.java index e7eb3a6fe43..ddf8d3fa89d 100644 --- a/src/com/android/settings/wifi/tether/WifiHotspotSpeedViewModel.java +++ b/src/com/android/settings/wifi/tether/WifiHotspotSpeedViewModel.java @@ -65,7 +65,7 @@ public class WifiHotspotSpeedViewModel extends AndroidViewModel { public WifiHotspotSpeedViewModel(@NotNull Application application) { super(application); - mWifiHotspotRepository = FeatureFactory.getFactory(application).getWifiFeatureProvider() + mWifiHotspotRepository = FeatureFactory.getFeatureFactory().getWifiFeatureProvider() .getWifiHotspotRepository(); mWifiHotspotRepository.get6gAvailable().observeForever(m6gAvailableObserver); mWifiHotspotRepository.get5gAvailable().observeForever(m5gAvailableObserver); @@ -177,6 +177,6 @@ public class WifiHotspotSpeedViewModel extends AndroidViewModel { } private void log(String msg) { - FeatureFactory.getFactory(getApplication()).getWifiFeatureProvider().verboseLog(TAG, msg); + FeatureFactory.getFeatureFactory().getWifiFeatureProvider().verboseLog(TAG, msg); } } diff --git a/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java index 0b6d533bb90..701c72c5df9 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java @@ -38,7 +38,7 @@ public class WifiTetherAutoOffPreferenceController extends BasePreferenceControl public WifiTetherAutoOffPreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); - WifiHotspotRepository wifiHotspotRepository = FeatureFactory.getFactory(context) + WifiHotspotRepository wifiHotspotRepository = FeatureFactory.getFeatureFactory() .getWifiFeatureProvider().getWifiHotspotRepository(); if (wifiHotspotRepository.isSpeedFeatureAvailable() && wifiHotspotRepository.isDualBand()) { mNeedShutdownSecondarySap = true; diff --git a/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceController.java index 448a2a30cc4..7a77d497acc 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceController.java @@ -44,7 +44,7 @@ public class WifiTetherMaximizeCompatibilityPreferenceController extends WifiTetherBasePreferenceController.OnTetherConfigUpdateListener listener) { super(context, listener); // If the Wi-Fi Hotspot Speed Feature available, then hide this controller. - mShouldHidePreference = FeatureFactory.getFactory(context) + mShouldHidePreference = FeatureFactory.getFeatureFactory() .getWifiFeatureProvider().getWifiHotspotRepository().isSpeedFeatureAvailable(); Log.d(TAG, "mShouldHidePreference:" + mShouldHidePreference); if (mShouldHidePreference) { diff --git a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java index c50357b21bf..7d0a86bc25f 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java @@ -54,7 +54,7 @@ public class WifiTetherPasswordPreferenceController extends WifiTetherBasePrefer WifiTetherPasswordPreferenceController(Context context, OnTetherConfigUpdateListener listener, MetricsFeatureProvider provider) { super(context, listener); - FeatureFactory featureFactory = FeatureFactory.getFactory(context); + FeatureFactory featureFactory = FeatureFactory.getFeatureFactory(); mMetricsFeatureProvider = (provider != null) ? provider : featureFactory.getMetricsFeatureProvider(); mWifiHotspotRepository = featureFactory.getWifiFeatureProvider().getWifiHotspotRepository(); diff --git a/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java index 9070d4487ea..1e415b345d3 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java @@ -63,7 +63,7 @@ public class WifiTetherSSIDPreferenceController extends WifiTetherBasePreference super(context, listener); mWifiDeviceNameTextValidator = new WifiDeviceNameTextValidator(); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); + mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } @Override diff --git a/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java index 9a9be989de9..79a97ae5fa4 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java @@ -56,7 +56,7 @@ public class WifiTetherSecurityPreferenceController extends WifiTetherBasePrefer OnTetherConfigUpdateListener listener) { super(context, listener); // If the Wi-Fi Hotspot Speed Feature available, then hide this controller. - mShouldHidePreference = FeatureFactory.getFactory(context) + mShouldHidePreference = FeatureFactory.getFeatureFactory() .getWifiFeatureProvider().getWifiHotspotRepository().isSpeedFeatureAvailable(); Log.d(TAG, "shouldHidePreference():" + mShouldHidePreference); if (mShouldHidePreference) { diff --git a/src/com/android/settings/wifi/tether/WifiTetherSettings.java b/src/com/android/settings/wifi/tether/WifiTetherSettings.java index 207d91a639c..85812a5e59e 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSettings.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSettings.java @@ -144,7 +144,7 @@ public class WifiTetherSettings extends RestrictedDashboardFragment return; } - mWifiTetherViewModel = FeatureFactory.getFactory(getContext()).getWifiFeatureProvider() + mWifiTetherViewModel = FeatureFactory.getFeatureFactory().getWifiFeatureProvider() .getWifiTetherViewModel(this); if (mWifiTetherViewModel != null) { setupSpeedFeature(mWifiTetherViewModel.isSpeedFeatureAvailable()); diff --git a/src/com/android/settings/wifi/tether/WifiTetherViewModel.java b/src/com/android/settings/wifi/tether/WifiTetherViewModel.java index 652612b7d2c..4cde1beaca0 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherViewModel.java +++ b/src/com/android/settings/wifi/tether/WifiTetherViewModel.java @@ -80,7 +80,7 @@ public class WifiTetherViewModel extends AndroidViewModel { public WifiTetherViewModel(@NotNull Application application) { super(application); - mWifiHotspotRepository = FeatureFactory.getFactory(application).getWifiFeatureProvider() + mWifiHotspotRepository = FeatureFactory.getFeatureFactory().getWifiFeatureProvider() .getWifiHotspotRepository(); } diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java index a6bd86577b0..d3634f09bb9 100644 --- a/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java +++ b/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java @@ -43,9 +43,9 @@ public class MetricsFeatureProviderTest { @Test public void getFactory_shouldReuseCachedInstance() { MetricsFeatureProvider feature1 = - FeatureFactory.getFactory(mContext).getMetricsFeatureProvider(); + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); MetricsFeatureProvider feature2 = - FeatureFactory.getFactory(mContext).getMetricsFeatureProvider(); + FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); assertThat(feature1).isSameInstanceAs(feature2); } diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java index 3552e1618ef..995bef643ed 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java @@ -45,7 +45,6 @@ import com.android.internal.os.RoSystemProperties; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.deletionhelper.ActivationWarningFragment; -import com.android.settings.overlay.FeatureFactory; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settingslib.PrimarySwitchPreference; @@ -83,7 +82,6 @@ public class AutomaticStorageManagementSwitchPreferenceControllerTest { .getSystemService(Context.DEVICE_POLICY_SERVICE); doReturn(mock(DevicePolicyManager.class)).when(mMockContext) .getSystemService(Context.DEVICE_POLICY_SERVICE); - FeatureFactory.getFactory(mContext); mResources = spy(mContext.getResources()); when(mContext.getResources()).thenReturn(mResources); diff --git a/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java b/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java index 93fb25fa60a..e391576a9a5 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java +++ b/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java @@ -146,8 +146,8 @@ public class SliceControllerInXmlCodeInspector extends CodeInspector { private List getIndexableXml() { final List xmlResSet = new ArrayList<>(); - final Collection bundles = FeatureFactory.getFactory( - mContext).getSearchFeatureProvider().getSearchIndexableResources() + final Collection bundles = FeatureFactory.getFeatureFactory() + .getSearchFeatureProvider().getSearchIndexableResources() .getProviderValues(); for (SearchIndexableData bundle : bundles) { diff --git a/tests/unit/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java b/tests/unit/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java index ce8338c3f42..53581eb8335 100644 --- a/tests/unit/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java +++ b/tests/unit/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java @@ -146,8 +146,8 @@ public class SliceControllerInXmlCodeInspector extends CodeInspector { private List getIndexableXml() { final List xmlResSet = new ArrayList<>(); - final Collection bundles = FeatureFactory.getFactory( - mContext).getSearchFeatureProvider().getSearchIndexableResources() + final Collection bundles = FeatureFactory.getFeatureFactory() + .getSearchFeatureProvider().getSearchIndexableResources() .getProviderValues(); for (SearchIndexableData bundle : bundles) {