Clean up FeatureFactory.getFeature()
Bug: 286764889 Test: m Settings Change-Id: I7e472e6b0ca6b7a735c1b92742ddf06c545176fc
This commit is contained in:
@@ -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);
|
||||
|
@@ -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);
|
||||
}
|
||||
|
||||
|
@@ -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);
|
||||
|
@@ -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) {
|
||||
|
@@ -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();
|
||||
|
@@ -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) {
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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 =
|
||||
|
Reference in New Issue
Block a user