diff options
| author | Jim Miller <jaggies@google.com> | 2013-10-11 18:11:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-11 18:11:05 -0700 |
| commit | c69fa2751350355370a85ab0b92655b73047b91e (patch) | |
| tree | 787d3b1929bf21fd5c92a1d74193caad778da0ad /packages/Keyguard/res | |
| parent | dcc31551f80500a096b8eb95f7f0670b4c19fd95 (diff) | |
| parent | 8eebe3b5bcdbdb1998d17bb7a058bd9ba26234c9 (diff) | |
| download | frameworks_base-c69fa2751350355370a85ab0b92655b73047b91e.zip frameworks_base-c69fa2751350355370a85ab0b92655b73047b91e.tar.gz frameworks_base-c69fa2751350355370a85ab0b92655b73047b91e.tar.bz2 | |
am 8eebe3b5: am dc70340d: Merge "Enable time format localization in keyguard" into klp-dev
* commit '8eebe3b5bcdbdb1998d17bb7a058bd9ba26234c9':
Enable time format localization in keyguard
Diffstat (limited to 'packages/Keyguard/res')
| -rw-r--r-- | packages/Keyguard/res/values/donottranslate.xml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/packages/Keyguard/res/values/donottranslate.xml b/packages/Keyguard/res/values/donottranslate.xml index 5ee226b..16f5a3e 100644 --- a/packages/Keyguard/res/values/donottranslate.xml +++ b/packages/Keyguard/res/values/donottranslate.xml @@ -15,6 +15,12 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- String matching the lock screen format for displaying the date. --> + <!-- Skeleton string format for displaying the date. --> <string name="abbrev_wday_month_day_no_year">EEEMMMMd</string> + + <!-- Skeleton string format for displaying the time in 12-hour format. --> + <string name="clock_12hr_format">hm</string> + + <!-- Skeleton string format for displaying the time in 24-hour format. --> + <string name="clock_24hr_format">Hm</string> </resources> |