Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e2ae547 authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Clean up FeatureFactory.getFeature() 

Bug: 286764889
Test: m Settings
Change-Id: I7e472e6b0ca6b7a735c1b92742ddf06c545176fc
parent 00623083

src/com/android/settings/AirplaneModeEnabler.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

src/com/android/settings/BugreportPreference.java

+2 −2
Original line number Diff line number Diff line
@@ -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();

src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

src/com/android/settings/accessibility/AccessibilitySettings.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

                }

src/com/android/settings/accessibility/CameraFlashNotificationPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -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));