Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Correct night light qs tile time formatting." into pi-dev

Browse Source 
am: 6567c65fa1

Change-Id: I1cd8d676e5e77317badac997661db5b5a1a48ee5
This commit is contained in:
android-build-team Robot
2018-05-03 10:58:33 -07:00
committed by android-build-merger
parent 5fb223fcbc 6567c65fa1
commit aa0d1fefe3
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java
View File

@@ -45,8 +45,8 @@ public class NightDisplayTile extends QSTileImpl<BooleanState>
* Pattern for {@link java.time.format.DateTimeFormatter} used to approximate the time to the
* nearest hour and add on the AM/PM indicator.
*/
private static final String HOUR_MINUTE_DATE_TIME_PATTERN = "h a";
private static final String APPROXIMATE_HOUR_DATE_TIME_PATTERN = "h:m a";
private static final String PATTERN_HOUR = "h a";
private static final String PATTERN_HOUR_MINUTE = "h:mm a";
private ColorDisplayController mController;
@@ -142,9 +142,7 @@ public class NightDisplayTile extends QSTileImpl<BooleanState>
// Choose between just showing the hour or also showing the minutes (based on the
// user-selected toggle time). This helps reduce how much space the label takes.
toggleTimeFormat = DateTimeFormatter.ofPattern(
toggleTime.getMinute() == 0
? HOUR_MINUTE_DATE_TIME_PATTERN
: APPROXIMATE_HOUR_DATE_TIME_PATTERN);
toggleTime.getMinute() == 0 ? PATTERN_HOUR : PATTERN_HOUR_MINUTE);
return mContext.getString(toggleTimeStringRes, toggleTime.format(toggleTimeFormat));