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

Commit 1d583e12 authored by Tony Mantler's avatar Tony Mantler
Browse files

Make PreferenceController a mixin 

Bug: 62912136
Test: Existing tests in BaseSearchIndexProviderTest
Change-Id: Ieda359806c09a019840b2005446c7ec8b61fdb00
parent 4bac4215

src/com/android/settings/DateTimeSettings.java

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.os.UserManager; 
import android.provider.SearchIndexableResource;



import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.core.PreferenceController;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.dashboard.SummaryLoader;

import com.android.settings.datetime.AutoTimePreferenceController;
@@ -36,6 +35,7 @@ import com.android.settings.datetime.TimePreferenceController; 
import com.android.settings.datetime.TimeZonePreferenceController;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.datetime.ZoneGetter;



import java.util.ArrayList;
@@ -72,8 +72,8 @@ public class DateTimeSettings extends DashboardFragment implements 
    }



    @Override

    protected List<PreferenceController> getPreferenceControllers(Context context) {

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

    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {

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

        final Activity activity = getActivity();

        final Intent intent = activity.getIntent();

        final boolean isFromSUW = intent.getBooleanExtra(EXTRA_IS_FROM_SUW, false);

src/com/android/settings/DeviceInfoSettings.java

+5 −5
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.content.Intent; 
import android.provider.SearchIndexableResource;



import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.core.PreferenceController;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.dashboard.SummaryLoader;

import com.android.settings.deviceinfo.AdditionalSystemUpdatePreferenceController;
@@ -41,6 +40,7 @@ import com.android.settings.deviceinfo.SafetyInfoPreferenceController; 
import com.android.settings.deviceinfo.SecurityPatchPreferenceController;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.core.lifecycle.Lifecycle;



import java.util.ArrayList;
@@ -84,7 +84,7 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable { 
    }



    @Override

    protected List<PreferenceController> getPreferenceControllers(Context context) {

    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {

        return buildPreferenceControllers(context, getActivity(), this /* fragment */,

                getLifecycle());

    }
@@ -114,9 +114,9 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable { 
        }

    };



    private static List<PreferenceController> buildPreferenceControllers(Context context,

    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,

            Activity activity, Fragment fragment, Lifecycle lifecycle) {

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

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

        controllers.add(

                new BuildNumberPreferenceController(context, activity, fragment, lifecycle));

        controllers.add(new AdditionalSystemUpdatePreferenceController(context));
@@ -149,7 +149,7 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable { 
                }



                @Override

                public List<PreferenceController> getPreferenceControllers(Context context) {

                public List<AbstractPreferenceController> getPreferenceControllers(Context context) {

                    return buildPreferenceControllers(context, null /*activity */,

                            null /* fragment */, null /* lifecycle */);

                }

src/com/android/settings/DisplaySettings.java

+5 −5
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.provider.SearchIndexableResource; 


import com.android.internal.hardware.AmbientDisplayConfiguration;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.core.PreferenceController;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.display.AmbientDisplayPreferenceController;

import com.android.settings.display.AutoBrightnessPreferenceController;
@@ -41,6 +40,7 @@ import com.android.settings.display.VrDisplayPreferenceController; 
import com.android.settings.display.WallpaperPreferenceController;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.core.lifecycle.Lifecycle;



import java.util.ArrayList;
@@ -77,7 +77,7 @@ public class DisplaySettings extends DashboardFragment { 
    }



    @Override

    protected List<PreferenceController> getPreferenceControllers(Context context) {

    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {

        return buildPreferenceControllers(context, getLifecycle());

    }
@@ -86,9 +86,9 @@ public class DisplaySettings extends DashboardFragment { 
        return R.string.help_uri_display;

    }



    private static List<PreferenceController> buildPreferenceControllers(

    private static List<AbstractPreferenceController> buildPreferenceControllers(

            Context context, Lifecycle lifecycle) {

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

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

        final AmbientDisplayConfiguration ambientDisplayConfig = new AmbientDisplayConfiguration(context);

        controllers.add(new AutoBrightnessPreferenceController(context, KEY_AUTO_BRIGHTNESS));

        controllers.add(new AutoRotatePreferenceController(context, lifecycle));
@@ -131,7 +131,7 @@ public class DisplaySettings extends DashboardFragment { 
                }



                @Override

                public List<PreferenceController> getPreferenceControllers(Context context) {

                public List<AbstractPreferenceController> getPreferenceControllers(Context context) {

                    return buildPreferenceControllers(context, null);

                }

            };

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

+3 −3
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ import android.support.v7.preference.PreferenceScreen; 
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.R;

import com.android.settings.Utils;

import com.android.settings.core.PreferenceController;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settingslib.accounts.AuthenticatorHelper;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.drawer.Tile;



import java.util.ArrayList;
@@ -108,8 +108,8 @@ public class AccountDetailDashboardFragment extends DashboardFragment { 
    }



    @Override

    protected List<PreferenceController> getPreferenceControllers(Context context) {

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

    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {

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

        mAccountSynController = new AccountSyncPreferenceController(context);

        controllers.add(mAccountSynController);

        mRemoveAccountController = new RemoveAccountPreferenceController(context, this);

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

+4 −2
Original line number Diff line number Diff line
@@ -26,15 +26,17 @@ import android.support.v7.preference.PreferenceScreen; 


import com.android.settings.R;

import com.android.settings.applications.LayoutPreference;

import com.android.settings.core.PreferenceController;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settings.widget.EntityHeaderController;

import com.android.settingslib.accounts.AuthenticatorHelper;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.core.lifecycle.Lifecycle;



import static com.android.settings.accounts.AccountDetailDashboardFragment.KEY_ACCOUNT;

import static com.android.settings.accounts.AccountDetailDashboardFragment.KEY_USER_HANDLE;



public class AccountHeaderPreferenceController extends PreferenceController {

public class AccountHeaderPreferenceController extends AbstractPreferenceController

        implements PreferenceControllerMixin {



    private static final String KEY_ACCOUNT_HEADER = "account_header";