summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2013-10-12 18:37:19 -0700
committerDeepanshu Gupta <deepanshu@google.com>2014-05-05 18:42:28 -0700
commit4b5da86d04200ba278b62ff99da91e212b87e9af (patch)
tree7f0c035e13a8868a1b52897c9a6ea023081ca462 /tools/layoutlib
parent5c166c9c04b6ea9d4955830e7ba277be71f17a6f (diff)
downloadframeworks_base-4b5da86d04200ba278b62ff99da91e212b87e9af.zip
frameworks_base-4b5da86d04200ba278b62ff99da91e212b87e9af.tar.gz
frameworks_base-4b5da86d04200ba278b62ff99da91e212b87e9af.tar.bz2
Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
Issue: https://code.google.com/p/android/issues/detail?id=59732 Change-Id: I281b3fdad88c591281a3645592c84f3e2cb61d09 (cherry picked from commit 6335590aa8997944cc7fb358a315dbb9b789f87f)
Diffstat (limited to 'tools/layoutlib')
-rw-r--r--tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java7
1 files changed, 5 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 fb2fc85..a7f8e4d 100644
--- a/tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java
+++ b/tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java
@@ -171,10 +171,13 @@ 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.longStandAloneWeekdayNames = result.longWeekdayNames;
result.shortStandAloneWeekdayNames = result.shortWeekdayNames;