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/TimeFormatPreferenceController.java | |
| 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/TimeFormatPreferenceController.java')
| -rw-r--r-- | src/com/android/settings/datetime/TimeFormatPreferenceController.java | 6 |
1 files changed, 4 insertions, 2 deletions
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"; |