diff options
author | Tony Mantler <nicoya@google.com> | 2017-06-13 13:09:25 -0700 |
---|---|---|
committer | Tony Mantler <nicoya@google.com> | 2017-06-26 10:58:36 -0700 |
commit | 1d583e125faf3ae4c9cd82636d8f3ecf1cdec3aa (patch) | |
tree | 57a949e2cd7d90057cf387c07a6b215e002205e9 /src/com/android/settings/datetime | |
parent | 4bac4215383227edf77a139e6f33bcc5689996b7 (diff) | |
download | packages_apps_Settings-1d583e125faf3ae4c9cd82636d8f3ecf1cdec3aa.tar.gz packages_apps_Settings-1d583e125faf3ae4c9cd82636d8f3ecf1cdec3aa.tar.bz2 packages_apps_Settings-1d583e125faf3ae4c9cd82636d8f3ecf1cdec3aa.zip |
Make PreferenceController a mixin
Bug: 62912136
Test: Existing tests in BaseSearchIndexProviderTest
Change-Id: Ieda359806c09a019840b2005446c7ec8b61fdb00
Diffstat (limited to 'src/com/android/settings/datetime')
6 files changed, 24 insertions, 16 deletions
diff --git a/src/com/android/settings/datetime/AutoTimePreferenceController.java b/src/com/android/settings/datetime/AutoTimePreferenceController.java index fdeef296af..0b70f45250 100644 --- a/src/com/android/settings/datetime/AutoTimePreferenceController.java +++ b/src/com/android/settings/datetime/AutoTimePreferenceController.java @@ -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; diff --git a/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java b/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java index b48e535e92..8a9568a524 100644 --- a/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java +++ b/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java @@ -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"; diff --git a/src/com/android/settings/datetime/DatePreferenceController.java b/src/com/android/settings/datetime/DatePreferenceController.java index 2a06e5a890..9582e9efed 100644 --- a/src/com/android/settings/datetime/DatePreferenceController.java +++ b/src/com/android/settings/datetime/DatePreferenceController.java @@ -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(); diff --git a/src/com/android/settings/datetime/TimeFormatPreferenceController.java b/src/com/android/settings/datetime/TimeFormatPreferenceController.java index 75fc80892a..92b371667f 100644 --- a/src/com/android/settings/datetime/TimeFormatPreferenceController.java +++ b/src/com/android/settings/datetime/TimeFormatPreferenceController.java @@ -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"; diff --git a/src/com/android/settings/datetime/TimePreferenceController.java b/src/com/android/settings/datetime/TimePreferenceController.java index 4862588f25..9bb5689c8f 100644 --- a/src/com/android/settings/datetime/TimePreferenceController.java +++ b/src/com/android/settings/datetime/TimePreferenceController.java @@ -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(); diff --git a/src/com/android/settings/datetime/TimeZonePreferenceController.java b/src/com/android/settings/datetime/TimeZonePreferenceController.java index f0b604e4d5..987132be66 100644 --- a/src/com/android/settings/datetime/TimeZonePreferenceController.java +++ b/src/com/android/settings/datetime/TimeZonePreferenceController.java @@ -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"; |