diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2013-10-17 09:14:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-17 09:14:54 -0700 |
| commit | a741163d61e1799c15dc08f69ba24798799fdd89 (patch) | |
| tree | 55538422b2823adedcb08154c816ebbd9af3b410 /tools | |
| parent | e636469fb52bbe6f21cf9894e5b1de7bb899eba6 (diff) | |
| parent | 4567ec02c468423351c56bcc587032577004735d (diff) | |
| download | frameworks_base-a741163d61e1799c15dc08f69ba24798799fdd89.zip frameworks_base-a741163d61e1799c15dc08f69ba24798799fdd89.tar.gz frameworks_base-a741163d61e1799c15dc08f69ba24798799fdd89.tar.bz2 | |
am 4567ec02: am ca429e08: am 9568ad39: am 94e5ada7: am 81f74f4b: Fix DatePicker and Calendar widget in layoutlib.
* commit '4567ec02c468423351c56bcc587032577004735d':
Fix DatePicker and Calendar widget in layoutlib.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java b/tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java index cd4f82b..294d743 100644 --- a/tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java +++ b/tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java @@ -181,12 +181,18 @@ public class ICU_Delegate { result.longStandAloneMonthNames = result.longMonthNames; result.shortStandAloneMonthNames = result.shortMonthNames; + // The platform code expects this to begin at index 1, rather than 0. It maps it directly to + // the constants from java.util.Calendar.<weekday> result.longWeekdayNames = new String[] { - "Monday" ,"Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday" }; + "", "Sunday", "Monday" ,"Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" }; result.shortWeekdayNames = new String[] { - "Mon" ,"Tue", "Wed", "Thu", "Fri", "Sat", "Sun" }; + "", "Sun", "Mon" ,"Tue", "Wed", "Thu", "Fri", "Sat" }; + result.tinyWeekdayNames = new String[] { + "", "S", "M", "T", "W", "T", "F", "S" }; + result.longStandAloneWeekdayNames = result.longWeekdayNames; result.shortStandAloneWeekdayNames = result.shortWeekdayNames; + result.tinyStandAloneWeekdayNames = result.tinyWeekdayNames; result.fullTimeFormat = ""; result.longTimeFormat = ""; |