From b9864427471ac206d08836a12a8b2f230c883d9e Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Tue, 9 Jun 2015 10:10:56 +0100 Subject: [PATCH] Modifications for changes to SettingsLib See associated changes in frameworks/base for details. Bug: 19058953 Bug: https://code.google.com/p/android-developer-preview/issues/detail?id=2132 Change-Id: Ic3393df28dd63ca75b203d1d0430d69cab7c40de --- src/com/android/settings/DateTimeSettings.java | 2 +- src/com/android/settings/ZonePicker.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java index c29dc47a84e..8a9e2ad847d 100644 --- a/src/com/android/settings/DateTimeSettings.java +++ b/src/com/android/settings/DateTimeSettings.java @@ -165,7 +165,7 @@ public class DateTimeSettings extends SettingsPreferenceFragment Date dummyDate = mDummyDate.getTime(); mDatePref.setSummary(DateFormat.getLongDateFormat(context).format(now.getTime())); mTimePref.setSummary(DateFormat.getTimeFormat(getActivity()).format(now.getTime())); - mTimeZone.setSummary(ZoneGetter.getTimeZoneText(now.getTimeZone(), true)); + mTimeZone.setSummary(ZoneGetter.getTimeZoneOffsetAndName(now.getTimeZone(), now.getTime())); mTime24Pref.setSummary(DateFormat.getTimeFormat(getActivity()).format(dummyDate)); } diff --git a/src/com/android/settings/ZonePicker.java b/src/com/android/settings/ZonePicker.java index a3c743539b8..2a61a5ae320 100644 --- a/src/com/android/settings/ZonePicker.java +++ b/src/com/android/settings/ZonePicker.java @@ -87,8 +87,7 @@ public class ZonePicker extends ListFragment { final String sortKey = (sortedByName ? ZoneGetter.KEY_DISPLAYNAME : ZoneGetter.KEY_OFFSET); final MyComparator comparator = new MyComparator(sortKey); - final ZoneGetter zoneGetter = new ZoneGetter(); - final List> sortedList = zoneGetter.getZones(context); + final List> sortedList = ZoneGetter.getZonesList(context); Collections.sort(sortedList, comparator); final SimpleAdapter adapter = new SimpleAdapter(context, sortedList, @@ -226,7 +225,7 @@ public class ZonePicker extends ListFragment { } } - private static class MyComparator implements Comparator> { + private static class MyComparator implements Comparator> { private String mSortingKey; public MyComparator(String sortingKey) { @@ -237,7 +236,7 @@ public class ZonePicker extends ListFragment { mSortingKey = sortingKey; } - public int compare(HashMap map1, HashMap map2) { + public int compare(Map map1, Map map2) { Object value1 = map1.get(mSortingKey); Object value2 = map2.get(mSortingKey);