From d27d3a89fa45e7a51cf2a3b829c5f44be8af9380 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Thu, 4 Dec 2014 21:41:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20JellyBean=20MR2=20?=
 =?UTF-8?q?=E4=B8=80=E4=B8=8B=E7=89=88=E6=9C=AC=20TextClock=2024=E6=97=B6?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=20=E5=B0=8F=E6=97=B6=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98(HH->kk)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/hippo/ehviewer/widget/TextClock.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/com/hippo/ehviewer/widget/TextClock.java b/src/com/hippo/ehviewer/widget/TextClock.java
index 921ac99ca..42b41f236 100644
--- a/src/com/hippo/ehviewer/widget/TextClock.java
+++ b/src/com/hippo/ehviewer/widget/TextClock.java
@@ -26,6 +26,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.database.ContentObserver;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Handler;
 import android.os.SystemClock;
 import android.provider.Settings;
@@ -39,7 +40,14 @@ import com.hippo.ehviewer.util.DateUtils;
 public class TextClock extends TextView {
 
     public static final CharSequence DEFAULT_FORMAT_12_HOUR = "hh:mm a";
-    public static final CharSequence DEFAULT_FORMAT_24_HOUR = "HH:mm";
+    public static final CharSequence DEFAULT_FORMAT_24_HOUR;
+
+    static {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2)
+            DEFAULT_FORMAT_24_HOUR = "kk:mm";
+        else
+            DEFAULT_FORMAT_24_HOUR = "HH:mm";
+    }
 
     private CharSequence mFormat12;
     private CharSequence mFormat24;