From a49bb44b1005bde748d405a03e30865942ab2667 Mon Sep 17 00:00:00 2001
From: Jay Aliomer <aaliomer@google.com>
Date: Fri, 14 Feb 2020 17:15:55 -0500
Subject: [PATCH] Dark theme time format

When changing device language, dark theme does not
change the AM/PM format to the proper new language setting

Test: all settings tests

Fixes: 149381251
Change-Id: I68763e24988837f917adad39f82b90e79573fd07
---
 src/com/android/settings/display/darkmode/TimeFormatter.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/display/darkmode/TimeFormatter.java b/src/com/android/settings/display/darkmode/TimeFormatter.java
index 87d22dabd27..5b1880642f4 100644
--- a/src/com/android/settings/display/darkmode/TimeFormatter.java
+++ b/src/com/android/settings/display/darkmode/TimeFormatter.java
@@ -25,13 +25,14 @@ import java.time.format.DateTimeFormatter;
 */
 public class TimeFormatter {
     private final Context mContext;
-    public static DateTimeFormatter formatter = DateTimeFormatter.ofPattern("hh:mm a");
+    private final DateTimeFormatter mFormatter;
     public TimeFormatter(Context context) {
         mContext = context;
+        mFormatter = DateTimeFormatter.ofPattern("hh:mm a");
     }
 
     public String of(LocalTime time) {
-        return is24HourFormat() ? time.toString() : formatter.format(time);
+        return is24HourFormat() ? time.toString() : mFormatter.format(time);
     }
 
     public boolean is24HourFormat() {