From fbab059e1ccf2108524a2493f4335e556bcff80b Mon Sep 17 00:00:00 2001 From: jackqdyulei Date: Tue, 27 Sep 2016 15:56:48 -0700 Subject: [PATCH] Adjustments based on the changes in ZoneGetter(settingslib) In settingslib, now the two public functions in ZoneGetter have the same logic(display the same name based on locale). This cl is to deal with changes in Settingslib. Bug: 19764807 Test: ag/1490275 Change-Id: I3e1c0bface752dc2ef4653ff58c4639c262964c1 --- src/com/android/settings/DateTimeSettings.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java index 1fed1897da1..f33ca85c1f2 100644 --- a/src/com/android/settings/DateTimeSettings.java +++ b/src/com/android/settings/DateTimeSettings.java @@ -168,7 +168,8 @@ 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.getTimeZoneOffsetAndName(now.getTimeZone(), now.getTime())); + mTimeZone.setSummary(ZoneGetter.getTimeZoneOffsetAndName(context, + now.getTimeZone(), now.getTime())); mTime24Pref.setSummary(DateFormat.getTimeFormat(getActivity()).format(dummyDate)); } @@ -385,7 +386,7 @@ public class DateTimeSettings extends SettingsPreferenceFragment public void setListening(boolean listening) { if (listening) { final Calendar now = Calendar.getInstance(); - mSummaryLoader.setSummary(this, ZoneGetter.getTimeZoneOffsetAndName( + mSummaryLoader.setSummary(this, ZoneGetter.getTimeZoneOffsetAndName(mContext, now.getTimeZone(), now.getTime())); } }