LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 8c4c7b6a: Merge "Use H rather than k in date/time formats."

Browse Source 
* commit '8c4c7b6a9851554371f94aef9f09813a7f0bc14e':
  Use H rather than k in date/time formats.
This commit is contained in:
Elliott Hughes
2013-03-20 09:47:31 -07:00
committed by Android Git Automerger
parent 76a2d4ef3e 8c4c7b6a98
commit 48f4a1f86e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
samples/ApiDemos/res/layout/textclock.xml
View File

@@ -47,8 +47,8 @@
<!-- Shows seconds --> <!-- Shows seconds -->
<TextClock <TextClock
android:format12Hour="hh:mm:ss aa" android:format12Hour="hh:mm:ss a"
android:format24Hour="kk:mm:ss" android:format24Hour="HH:mm:ss"
android:textSize="20sp" android:textSize="20sp"
android:shadowColor="#7fffffff" android:shadowColor="#7fffffff"
@@ -59,8 +59,8 @@
<!-- Use a fixed time zone --> <!-- Use a fixed time zone -->
<TextClock <TextClock
android:format12Hour="'Time in Paris:' MMM dd, yyyy h:mmaa" android:format12Hour="'Time in Paris:' MMM dd, yyyy h:mma"
android:format24Hour="'Time in Paris:' MMM dd, yyyy k:mm" android:format24Hour="'Time in Paris:' MMM dd, yyyy HH:mm"
android:timeZone="Europe/Paris" android:timeZone="Europe/Paris"
android:layout_width="wrap_content" android:layout_width="wrap_content"