diff options
| author | Elliott Hughes <enh@google.com> | 2013-03-08 16:21:21 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-08 16:21:21 -0800 |
| commit | d6875e3334899be84b98d0fd32efff1f1b5775da (patch) | |
| tree | 4594c0e734ad4f20260fe6581dc1e1c63ae68248 /api/current.txt | |
| parent | 6e5d6492db4f0bed604e67ee53b0c99e0685c55f (diff) | |
| parent | 2cb314ebc7bb6495a94f577dfb57f9e6c56033ef (diff) | |
| download | frameworks_base-d6875e3334899be84b98d0fd32efff1f1b5775da.zip frameworks_base-d6875e3334899be84b98d0fd32efff1f1b5775da.tar.gz frameworks_base-d6875e3334899be84b98d0fd32efff1f1b5775da.tar.bz2 | |
am 2cb314eb: am e0cd3c19: Merge "Improve DateFormat.format."
* commit '2cb314ebc7bb6495a94f577dfb57f9e6c56033ef':
Improve DateFormat.format.
Diffstat (limited to 'api/current.txt')
| -rw-r--r-- | api/current.txt | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/api/current.txt b/api/current.txt index 5794453..385d9ac 100644 --- a/api/current.txt +++ b/api/current.txt @@ -22518,19 +22518,19 @@ package android.text.format { method public static java.text.DateFormat getMediumDateFormat(android.content.Context); method public static java.text.DateFormat getTimeFormat(android.content.Context); method public static boolean is24HourFormat(android.content.Context); - field public static final char AM_PM = 97; // 0x0061 'a' - field public static final char CAPITAL_AM_PM = 65; // 0x0041 'A' - field public static final char DATE = 100; // 0x0064 'd' - field public static final char DAY = 69; // 0x0045 'E' - field public static final char HOUR = 104; // 0x0068 'h' - field public static final char HOUR_OF_DAY = 107; // 0x006b 'k' - field public static final char MINUTE = 109; // 0x006d 'm' - field public static final char MONTH = 77; // 0x004d 'M' - field public static final char QUOTE = 39; // 0x0027 '\'' - field public static final char SECONDS = 115; // 0x0073 's' - field public static final char STANDALONE_MONTH = 76; // 0x004c 'L' - field public static final char TIME_ZONE = 122; // 0x007a 'z' - field public static final char YEAR = 121; // 0x0079 'y' + field public static final deprecated char AM_PM = 97; // 0x0061 'a' + field public static final deprecated char CAPITAL_AM_PM = 65; // 0x0041 'A' + field public static final deprecated char DATE = 100; // 0x0064 'd' + field public static final deprecated char DAY = 69; // 0x0045 'E' + field public static final deprecated char HOUR = 104; // 0x0068 'h' + field public static final deprecated char HOUR_OF_DAY = 107; // 0x006b 'k' + field public static final deprecated char MINUTE = 109; // 0x006d 'm' + field public static final deprecated char MONTH = 77; // 0x004d 'M' + field public static final deprecated char QUOTE = 39; // 0x0027 '\'' + field public static final deprecated char SECONDS = 115; // 0x0073 's' + field public static final deprecated char STANDALONE_MONTH = 76; // 0x004c 'L' + field public static final deprecated char TIME_ZONE = 122; // 0x007a 'z' + field public static final deprecated char YEAR = 121; // 0x0079 'y' } public class DateUtils { |