Make PreferenceController a mixin

Bug: 62912136
Test: Existing tests in BaseSearchIndexProviderTest
Change-Id: Ieda359806c09a019840b2005446c7ec8b61fdb00
This commit is contained in:
Tony Mantler
2017-06-13 13:09:25 -07:00
parent 4bac421538
commit 1d583e125f
203 changed files with 1027 additions and 782 deletions

View File

@@ -20,12 +20,13 @@ import android.content.Context;
import android.provider.Settings;
import android.support.v7.preference.Preference;
import com.android.settings.core.PreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.core.AbstractPreferenceController;
public class AutoTimePreferenceController extends PreferenceController
implements Preference.OnPreferenceChangeListener {
public class AutoTimePreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
private static final String KEY_AUTO_TIME = "auto_time";
private final UpdateTimeAndDateCallback mCallback;

View File

@@ -22,10 +22,11 @@ import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
public class AutoTimeZonePreferenceController extends PreferenceController
implements Preference.OnPreferenceChangeListener {
public class AutoTimeZonePreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
private static final String KEY_AUTO_TIME_ZONE = "auto_zone";

View File

@@ -26,12 +26,13 @@ import android.text.TextUtils;
import android.text.format.DateFormat;
import android.widget.DatePicker;
import com.android.settings.core.PreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.Calendar;
public class DatePreferenceController extends PreferenceController implements
DatePickerDialog.OnDateSetListener {
public class DatePreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, DatePickerDialog.OnDateSetListener {
public interface DatePreferenceHost extends UpdateTimeAndDateCallback {
void showDatePicker();

View File

@@ -25,12 +25,14 @@ import android.support.v7.preference.TwoStatePreference;
import android.text.TextUtils;
import android.text.format.DateFormat;
import com.android.settings.core.PreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.Calendar;
import java.util.Date;
public class TimeFormatPreferenceController extends PreferenceController {
public class TimeFormatPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
static final String HOURS_12 = "12";
static final String HOURS_24 = "24";

View File

@@ -25,12 +25,13 @@ import android.text.TextUtils;
import android.text.format.DateFormat;
import android.widget.TimePicker;
import com.android.settings.core.PreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.Calendar;
public class TimePreferenceController extends PreferenceController implements
TimePickerDialog.OnTimeSetListener {
public class TimePreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, TimePickerDialog.OnTimeSetListener {
public interface TimePreferenceHost extends UpdateTimeAndDateCallback {
void showTimePicker();

View File

@@ -20,12 +20,14 @@ import android.content.Context;
import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference;
import com.android.settings.core.PreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.datetime.ZoneGetter;
import java.util.Calendar;
public class TimeZonePreferenceController extends PreferenceController {
public class TimeZonePreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
private static final String KEY_TIMEZONE = "timezone";