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

Clean up FeatureFactory.getFeature()

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

2
src/com/android/settings/AirplaneModeEnabler.java
View File

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

4
src/com/android/settings/BugreportPreference.java
View File

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

2
src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java
View File

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

2
src/com/android/settings/accessibility/AccessibilitySettings.java
View File

@@ -554,7 +554,7 @@ public class AccessibilitySettings extends DashboardFragment {
@Override
public List<SearchIndexableRaw> getRawDataToIndex(Context context,
boolean enabled) {
return FeatureFactory.getFactory(context)
return FeatureFactory.getFeatureFactory()
.getAccessibilitySearchFeatureProvider().getSearchIndexableRawData(
context);
}

2
src/com/android/settings/accessibility/CameraFlashNotificationPreferenceController.java
View File

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

4
src/com/android/settings/accessibility/RestrictedPreferenceHelper.java
View File

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

2
src/com/android/settings/accessibility/ScreenFlashNotificationPreferenceController.java
View File

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

2
src/com/android/settings/accounts/AccountPreferenceController.java
View File

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

6
src/com/android/settings/accounts/AvatarViewMixin.java
View File

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

2
src/com/android/settings/accounts/RemoveAccountPreferenceController.java
View File

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

2
src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
View File

@@ -245,7 +245,7 @@ public class ActivityEmbeddingRulesController {
private void registerAlwaysExpandRule() {
final Set<ActivityFilter> 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);

2
src/com/android/settings/applications/UsageAccessDetails.java
View File

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

2
src/com/android/settings/applications/appinfo/AppSettingPreferenceController.java
View File

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

2
src/com/android/settings/applications/appinfo/DrawOverlayDetails.java
View File

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

2
src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragment.java
View File

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

2
src/com/android/settings/applications/appinfo/ManageExternalStorageDetails.java
View File

@@ -67,7 +67,7 @@ public class ManageExternalStorageDetails extends AppInfoWithHeader implements
mSwitchPref.setOnPreferenceChangeListener(this);
mMetricsFeatureProvider =
FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider();
FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
}
@Override

2
src/com/android/settings/applications/appinfo/WriteSettingsDetails.java
View File

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

2
src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
View File

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

2
src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
View File

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

2
src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java
View File

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

2
src/com/android/settings/applications/specialaccess/notificationaccess/ApprovalPreferenceController.java
View File

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

2
src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetails.java
View File

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

2
src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java
View File

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

2
src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java
View File

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

3
src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessController.java
View File

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

2
src/com/android/settings/biometrics/BiometricEnrollActivity.java
View File

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

2
src/com/android/settings/biometrics/BiometricEnrollBase.java
View File

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

2
src/com/android/settings/biometrics/BiometricStatusPreferenceController.java
View File

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

2
src/com/android/settings/biometrics/BiometricUtils.java
View File

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

12
src/com/android/settings/biometrics/face/FaceSettings.java
View File

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

2
src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceController.java
View File

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

2
src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java
View File

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

6
src/com/android/settings/biometrics2/factory/BiometricsViewModelFactory.java
View File

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

2
src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsController.java
View File

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

2
src/com/android/settings/bluetooth/BluetoothDetailsController.java
View File

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

4
src/com/android/settings/bluetooth/BluetoothDetailsRelatedToolsController.java
View File

@@ -75,8 +75,8 @@ public class BluetoothDetailsRelatedToolsController extends BluetoothDetailsCont
mPreferenceCategory.removePreference(liveCaptionPreference);
}
final List<ComponentName> relatedToolsList = FeatureFactory.getFactory(
mContext).getBluetoothFeatureProvider().getRelatedTools();
final List<ComponentName> relatedToolsList =
FeatureFactory.getFeatureFactory().getBluetoothFeatureProvider().getRelatedTools();
if (!CollectionUtils.isEmpty(relatedToolsList)) {
addAccessibilityInstalledRelatedPreference(relatedToolsList);
}

8
src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
View File

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

4
src/com/android/settings/bluetooth/BluetoothDevicePairingDetailBase.java
View File

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

2
src/com/android/settings/bluetooth/BluetoothDevicePreference.java
View File

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

2
src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java
View File

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

2
src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
View File

@@ -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();
}
/**

2
src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java
View File

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

2
src/com/android/settings/bluetooth/Utils.java
View File

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

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

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

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

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

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

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

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

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

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

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

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

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

2
src/com/android/settings/core/InstrumentedActivity.java
View File

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

2
src/com/android/settings/core/InstrumentedFragment.java
View File

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

2
src/com/android/settings/core/InstrumentedPreferenceFragment.java
View File

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

2
src/com/android/settings/core/TogglePreferenceController.java
View File

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

2
src/com/android/settings/core/instrumentation/InstrumentedDialogFragment.java
View File

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

2
src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
View File

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

4
src/com/android/settings/dashboard/profileselector/ProfileSelectDialog.java
View File

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

2
src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java
View File

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

2
src/com/android/settings/datausage/CellDataPreference.java
View File

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

2
src/com/android/settings/datausage/DataSaverBackend.java
View File

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

2
src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java
View File

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

4
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
View File

@@ -372,8 +372,8 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
DisableDevSettingsDialogFragment.show(this /* host */);
}
}
FeatureFactory.getFactory(
getContext()).getSearchFeatureProvider().sendPreIndexIntent(getContext());
FeatureFactory.getFeatureFactory().getSearchFeatureProvider()
.sendPreIndexIntent(getContext());
}
}

4
src/com/android/settings/development/qstile/DevelopmentTiles.java
View File

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

2
src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java
View File

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

6
src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
View File

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

6
src/com/android/settings/deviceinfo/StorageWizardFormatSlow.java
View File

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

4
src/com/android/settings/deviceinfo/StorageWizardInit.java
View File

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

4
src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
View File

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

4
src/com/android/settings/deviceinfo/batteryinfo/BatteryFirstUseDatePreferenceController.java
View File

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

4
src/com/android/settings/deviceinfo/batteryinfo/BatteryManufactureDatePreferenceController.java
View File

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

2
src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
View File

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

2
src/com/android/settings/deviceinfo/storage/ManageStoragePreferenceController.java
View File

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

2
src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
View File

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

2
src/com/android/settings/display/AdaptiveSleepPreferenceController.java
View File

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

2
src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
View File

@@ -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();
}
/**

2
src/com/android/settings/display/AutoRotatePreferenceController.java
View File

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

2
src/com/android/settings/display/AutoRotateSwitchBarController.java
View File

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

2
src/com/android/settings/display/BatteryPercentagePreferenceController.java
View File

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

2
src/com/android/settings/display/ControlsPrivacyPreferenceController.java
View File

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

2
src/com/android/settings/display/DeviceStateAutoRotateSettingController.java
View File

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

2
src/com/android/settings/display/NightDisplayActivationPreferenceController.java
View File

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

2
src/com/android/settings/display/ScreenTimeoutSettings.java
View File

@@ -106,7 +106,7 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment implements
public ScreenTimeoutSettings() {
super();
mMetricsFeatureProvider = FeatureFactory.getFactory(getContext())
mMetricsFeatureProvider = FeatureFactory.getFeatureFactory()
.getMetricsFeatureProvider();
}

2
src/com/android/settings/display/SmartAutoRotateController.java
View File

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

2
src/com/android/settings/display/SmartAutoRotatePreferenceController.java
View File

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

2
src/com/android/settings/display/ThemePreferenceController.java
View File

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

2
src/com/android/settings/display/TwilightLocationPreferenceController.java
View File

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

2
src/com/android/settings/display/WalletPrivacyPreferenceController.java
View File

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

2
src/com/android/settings/display/darkmode/DarkModeActivationPreferenceController.java
View File

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

2
src/com/android/settings/dream/DreamPickerController.java
View File

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

2
src/com/android/settings/emergency/MoreSettingsPreferenceController.java
View File

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

4
src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
View File

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

2
src/com/android/settings/fuelgauge/HighPowerDetail.java
View File

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

2
src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java
View File

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

2
src/com/android/settings/fuelgauge/RestrictedAppDetails.java
View File

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

2
src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettings.java
View File

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

2
src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java
View File

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

2
src/com/android/settings/fuelgauge/batterytip/actions/BatteryTipAction.java
View File

@@ -30,7 +30,7 @@ public abstract class BatteryTipAction {
public BatteryTipAction(Context context) {
mContext = context;
mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
}
/**

2
src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java
View File

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

2
src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java
View File

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

2
src/com/android/settings/gestures/DoubleTapPowerSettings.java
View File

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

2
src/com/android/settings/gestures/DoubleTapScreenSettings.java
View File

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

Some files were not shown because too many files have changed in this diff Show More