diff options
author | Daisuke Miyakawa <dmiyakawa@google.com> | 2010-09-03 15:40:17 -0700 |
---|---|---|
committer | Daisuke Miyakawa <dmiyakawa@google.com> | 2010-09-08 16:15:44 -0700 |
commit | 0f4f2f3a81f2a6d7100b4cff0d8de062cb2bc8f6 (patch) | |
tree | f9a9ce32131fa2418e74fe1c395e989f7dd9a536 /src/com/android/settings/DateTimeSettings.java | |
parent | 0cec40628bae261e2e378495dcdd4966179dacd2 (diff) | |
download | packages_apps_Settings-0f4f2f3a81f2a6d7100b4cff0d8de062cb2bc8f6.zip packages_apps_Settings-0f4f2f3a81f2a6d7100b4cff0d8de062cb2bc8f6.tar.gz packages_apps_Settings-0f4f2f3a81f2a6d7100b4cff0d8de062cb2bc8f6.tar.bz2 |
Fragmentize ZoneList, which is needed in DateTimeSettings refactoring.
- remove old ZonePicker and rename ZoneList to ZonePicker, as
the name is really confusing (see LocalePicker)
- Make the new ZonePicker fragment.
- remove dependency toward "ZoneList" class.
-- AndroidManifest.xml does not allow the other components to
access ZoneList directly, so it would be ok to remove without
using activity-alias.
-- Noticed there is a significant code duplication between
DateTimeSettings and DateTimeSettingsActivity. I'll work on it
later.
- add DateTimeSettingsSetupWizardXL class, which is not used yet,
but will be in the near future.
-- It is not recognized by AndroidManifest.xml
Change-Id: Id26152a3d560f9e0bd84afdf3e1c5101f0e166b4
Diffstat (limited to 'src/com/android/settings/DateTimeSettings.java')
-rw-r--r-- | src/com/android/settings/DateTimeSettings.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java index 0a929ba..61cc613 100644 --- a/src/com/android/settings/DateTimeSettings.java +++ b/src/com/android/settings/DateTimeSettings.java @@ -41,8 +41,7 @@ import java.util.Calendar; import java.util.Date; import java.util.TimeZone; -public class DateTimeSettings - extends SettingsPreferenceFragment +public class DateTimeSettings extends SettingsPreferenceFragment implements OnSharedPreferenceChangeListener, TimePickerDialog.OnTimeSetListener , DatePickerDialog.OnDateSetListener { @@ -152,6 +151,7 @@ public class DateTimeSettings mDateFormat.setSummary(shortDateFormat.format(dummyDate)); } + @Override public void onDateSet(DatePicker view, int year, int month, int day) { Calendar c = Calendar.getInstance(); @@ -166,6 +166,7 @@ public class DateTimeSettings updateTimeAndDateDisplay(); } + @Override public void onTimeSet(TimePicker view, int hourOfDay, int minute) { Calendar c = Calendar.getInstance(); @@ -183,6 +184,7 @@ public class DateTimeSettings // SystemClock time. } + @Override public void onSharedPreferenceChanged(SharedPreferences preferences, String key) { if (key.equals(KEY_DATE_FORMAT)) { String format = preferences.getString(key, @@ -274,12 +276,8 @@ public class DateTimeSettings set24Hour(((CheckBoxPreference)mTime24Pref).isChecked()); updateTimeAndDateDisplay(); timeUpdated(); - } else if (preference == mTimeZone) { - Intent intent = new Intent(); - intent.setClass(getActivity(), ZoneList.class); - startActivityForResult(intent, 0); } - return false; + return super.onPreferenceTreeClick(preferenceScreen, preference); } @Override |