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

Commit 572efd22 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "More renaming in DashboardFragment"

parents cfa486f7 f7843ada

src/com/android/settings/DateTimeSettings.java

+3 −3
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ public class DateTimeSettings extends DashboardFragment implements 
    }



    @Override

    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {

    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {

        final List<AbstractPreferenceController> controllers = new ArrayList<>();

        final Activity activity = getActivity();

        final Intent intent = activity.getIntent();
@@ -112,10 +112,10 @@ public class DateTimeSettings extends DashboardFragment implements 
    public Dialog onCreateDialog(int id) {

        switch (id) {

            case DatePreferenceController.DIALOG_DATEPICKER:

                return getPreferenceController(DatePreferenceController.class)

                return use(DatePreferenceController.class)

                        .buildDatePicker(getActivity());

            case TimePreferenceController.DIALOG_TIMEPICKER:

                return getPreferenceController(TimePreferenceController.class)

                return use(TimePreferenceController.class)

                        .buildTimePicker(getActivity());

            default:

                throw new IllegalArgumentException();

src/com/android/settings/DisplaySettings.java

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ public class DisplaySettings extends DashboardFragment { 
    }



    @Override

    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {

    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {

        return buildPreferenceControllers(context, getLifecycle());

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public class VibrationSettings extends DashboardFragment { 
    }



    @Override

    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {

    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {

        return buildControllers(context, getLifecycle());

    }

src/com/android/settings/accounts/AccountDashboardFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ public class AccountDashboardFragment extends DashboardFragment { 
    }



    @Override

    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {

    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {

        final List<AbstractPreferenceController> controllers = new ArrayList<>();

        final String[] authorities = getIntent().getStringArrayExtra(EXTRA_AUTHORITIES);

        final AccountPreferenceController accountPrefController =

src/com/android/settings/accounts/AccountDetailDashboardFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ public class AccountDetailDashboardFragment extends DashboardFragment { 
    }



    @Override

    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {

    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {

        final List<AbstractPreferenceController> controllers = new ArrayList<>();

        mAccountSynController = new AccountSyncPreferenceController(context);

        controllers.add(mAccountSynController);