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

Merge "Time for dark theme doesnt format 24 hr correctly" into rvc-d1-dev

Browse Source
This commit is contained in:
Lucas Dupin
2020-08-12 21:27:45 +00:00
committed by Android (Google) Code Review
parent 1419ef2874 b569dfdac8
commit e899f749a1
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/settings/display/darkmode/TimeFormatter.java
View File

@@ -18,26 +18,29 @@ package com.android.settings.display.darkmode;
import android.content.Context; import android.content.Context;
import java.time.LocalTime; import java.time.LocalTime;
import java.time.format.DateTimeFormatter; import java.util.Calendar;
import java.util.Locale; import java.util.TimeZone;
/** /**
* Formats LocalTime to the locale time string format * Formats LocalTime to the locale time string format
*/ */
public class TimeFormatter { public class TimeFormatter {
private final Context mContext; private final Context mContext;
private final DateTimeFormatter mFormatter; private final java.text.DateFormat mFormatter;
public TimeFormatter(Context context) { public TimeFormatter(Context context) {
mContext = context; mContext = context;
Locale locale = mContext.getResources().getConfiguration().locale; mFormatter = android.text.format.DateFormat.getTimeFormat(context);
if (locale == null) { mFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
locale = Locale.getDefault();
}
mFormatter = DateTimeFormatter.ofPattern("hh:mm a", locale);
} }
public String of(LocalTime time) { public String of(LocalTime time) {
return mFormatter.format(time); final Calendar c = Calendar.getInstance();
c.setTimeZone(mFormatter.getTimeZone());
c.set(Calendar.HOUR_OF_DAY, time.getHour());
c.set(Calendar.MINUTE, time.getMinute());
c.set(Calendar.SECOND, 0);
c.set(Calendar.MILLISECOND, 0);
return mFormatter.format(c.getTime());
} }
public boolean is24HourFormat() { public boolean is24HourFormat() {