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

am 3dd51556: Merge "Remove vestigial "Choose date format" option."

Browse Source 
* commit '3dd51556bcbf7addcc17d29dd360165ee7ede1ee':
  Remove vestigial "Choose date format" option.
This commit is contained in:
Elliott Hughes
2014-11-17 17:37:35 +00:00
committed by Android Git Automerger
parent 5cf2b43f91 3dd51556bc
commit ba5863929a
5 changed files with 4 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/com/android/settings/fuelgauge/BatteryHistoryChart.java
View File

@@ -667,33 +667,11 @@ public class BatteryHistoryChart extends View {
}
private boolean isDayFirst() {
String value = Settings.System.getString(mContext.getContentResolver(),
Settings.System.DATE_FORMAT);
if (value == null) {
LocaleData d = LocaleData.get(mContext.getResources().getConfiguration().locale);
value = d.shortDateFormat4;
}
LocaleData d = LocaleData.get(mContext.getResources().getConfiguration().locale);
String value = d.shortDateFormat4;
return value.indexOf('M') > value.indexOf('d');
}
/*
private void buildTime() {
java.text.DateFormat shortDateFormat = DateFormat.getDateFormat(context);
final Calendar now = Calendar.getInstance();
mDummyDate.setTimeZone(now.getTimeZone());
// We use December 31st because it's unambiguous when demonstrating the date format.
// We use 13:00 so we can demonstrate the 12/24 hour options.
mDummyDate.set(now.get(Calendar.YEAR), 11, 31, 13, 0, 0);
Date dummyDate = mDummyDate.getTime();
mTimePref.setSummary(DateFormat.getTimeFormat(getActivity()).format(now.getTime()));
mTimeZone.setSummary(getTimeZoneText(now.getTimeZone(), true));
mDatePref.setSummary(shortDateFormat.format(now.getTime()));
mDateFormat.setSummary(shortDateFormat.format(dummyDate));
mTime24Pref.setSummary(DateFormat.getTimeFormat(getActivity()).format(dummyDate));
}
*/
@Override
protected void onSizeChanged(int w, int h, int oldw, int oldh) {
super.onSizeChanged(w, h, oldw, oldh);