时间使用12小时制，下拉状态栏和锁屏时间格式“上午”或“下午”显示

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
diff --git a/frameworks/base/packages/SystemUI/res-keyguard/values/strings.xml b/frameworks/base/packages/SystemUI/res-keyguard/values/strings.xml
old mode 100644
new mode 100755
index 2d08350..dafa277
--- a/frameworks/base/packages/SystemUI/res-keyguard/values/strings.xml
+++ b/frameworks/base/packages/SystemUI/res-keyguard/values/strings.xml
@@ -112,7 +112,9 @@
     <string name="keyguard_carrier_name_with_sim_locked_template" translatable="false"><xliff:g id="carrier">%s</xliff:g> (<xliff:g id="message">%s</xliff:g>)</string>
 
     <!-- Time format strings for fall-back clock widget -->
-    <string name="keyguard_widget_12_hours_format" translatable="false">h:mm</string>
+    <!--jicong.wang modify for bug 17609 start {@-->
+    <string name="keyguard_widget_12_hours_format" translatable="false">aa</string>
+    <!--jicong.wang modify for bug 17609 end @}-->
     <!-- Time format strings for fall-back clock widget -->
     <string name="keyguard_widget_24_hours_format" translatable="false">kk:mm</string>
     <!-- The character used in keyguard_widget_12_hours_format and keyguard_widget_24_hours_format
diff --git a/frameworks/base/packages/SystemUI/res/layout/status_bar.xml b/frameworks/base/packages/SystemUI/res/layout/status_bar.xml
old mode 100644
new mode 100755
index f8db97d..00ae8fe
--- a/frameworks/base/packages/SystemUI/res/layout/status_bar.xml
+++ b/frameworks/base/packages/SystemUI/res/layout/status_bar.xml
@@ -70,7 +70,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout="@layout/operator_name" />
-
+                <!--jicong.wang modify for bug 17609 start -->
                 <com.android.systemui.statusbar.policy.Clock
                     android:id="@+id/clock"
                     android:layout_width="wrap_content"
@@ -80,7 +80,9 @@
                     android:paddingStart="@dimen/status_bar_left_clock_starting_padding"
                     android:paddingEnd="@dimen/status_bar_left_clock_end_padding"
                     android:gravity="center_vertical|start"
+                    systemui:amPmStyle="normal"
                 />
+                <!--jicong.wang modify for bug 17609 end @}-->
 
                 <com.android.systemui.statusbar.AlphaOptimizedFrameLayout
                     android:id="@+id/notification_icon_area"
diff --git a/frameworks/base/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java b/frameworks/base/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java
old mode 100644
new mode 100755
index 5a1c997..eda3f07
--- a/frameworks/base/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java
+++ b/frameworks/base/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java
@@ -372,9 +372,11 @@ public class KeyguardStatusView extends GridLayout implements
             clockView12 = DateFormat.getBestDateTimePattern(locale, clockView12Skel);
             // CLDR insists on adding an AM/PM indicator even though it wasn't in the skeleton
             // format.  The following code removes the AM/PM indicator if we didn't want it.
-            if (!clockView12Skel.contains("a")) {
+            /*jicong.wang modify for bug 17609 start {@*/
+            /*if (!clockView12Skel.contains("a")) {
                 clockView12 = clockView12.replaceAll("a", "").trim();
-            }
+            }*/
+            /*jicong.wang modify for bug 17609 end @}*/
 
             clockView24 = DateFormat.getBestDateTimePattern(locale, clockView24Skel);