PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjustments based on the changes in ZoneGetter(settingslib)

Browse Source 
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
This commit is contained in:
jackqdyulei
2016-09-27 15:56:48 -07:00
parent 3260ef8be0
commit fbab059e1c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/DateTimeSettings.java
View File

@@ -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()));
}
}