Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c28330ec authored by Neil Fuller's avatar Neil Fuller Committed by Android (Google) Code Review
Browse files

Merge "Modifications for changes to SettingsLib" into mnc-dev

parents 8e2c4787 b9864427

src/com/android/settings/DateTimeSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -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));

    }

src/com/android/settings/ZonePicker.java

+3 −4
Original line number Diff line number Diff line
@@ -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<HashMap<String, Object>> sortedList = zoneGetter.getZones(context);

        final List<Map<String, Object>> 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<HashMap<?, ?>> {

    private static class MyComparator implements Comparator<Map<?, ?>> {

        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);