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

Merge "Incorrect localization of dark theme custom time" into rvc-dev

Browse Source
This commit is contained in:
Jay Aliomer
2020-05-28 22:21:21 +00:00
committed by Android (Google) Code Review
parent be2190fe64 57cc7d01ae
commit fb6711ae92
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@ import android.content.Context;
import java.time.LocalTime; import java.time.LocalTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.Locale;
/** /**
* Formats LocalTime to the locale time string format * Formats LocalTime to the locale time string format
@@ -28,11 +29,15 @@ public class TimeFormatter {
private final DateTimeFormatter mFormatter; private final DateTimeFormatter mFormatter;
public TimeFormatter(Context context) { public TimeFormatter(Context context) {
mContext = context; mContext = context;
mFormatter = DateTimeFormatter.ofPattern("hh:mm a"); Locale locale = mContext.getResources().getConfiguration().locale;
if (locale == null) {
locale = Locale.getDefault();
}
mFormatter = DateTimeFormatter.ofPattern("hh:mm a", locale);
} }
public String of(LocalTime time) { public String of(LocalTime time) {
return is24HourFormat() ? time.toString() : mFormatter.format(time); return mFormatter.format(time);
} }
public boolean is24HourFormat() { public boolean is24HourFormat() {

1
tests/robotests/src/com/android/settings/display/darkmode/DarkModeActivationPreferenceControllerTest.java
View File

@@ -82,6 +82,7 @@ public class DarkModeActivationPreferenceControllerTest {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mService = mock(UiModeManager.class); mService = mock(UiModeManager.class);
when(mContext.getResources()).thenReturn(res); when(mContext.getResources()).thenReturn(res);
when(res.getConfiguration()).thenReturn(mConfigNightNo);
when(mContext.getSystemService(UiModeManager.class)).thenReturn(mService); when(mContext.getSystemService(UiModeManager.class)).thenReturn(mService);
when(mContext.getSystemService(PowerManager.class)).thenReturn(mPM); when(mContext.getSystemService(PowerManager.class)).thenReturn(mPM);
when(mScreen.findPreference(anyString())).thenReturn(mPreference); when(mScreen.findPreference(anyString())).thenReturn(mPreference);