summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2014-05-13 01:52:32 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-13 01:52:32 +0000
commit40fea8b1bf689933e63941b5fa5e3379f82c88b5 (patch)
treed3b0400cdaa9c9fd40176748059f77b9f5122f94 /tools/layoutlib
parent065ce2e8b3e11ff8bb1699748edbd23d272bc8a6 (diff)
parent4b5da86d04200ba278b62ff99da91e212b87e9af (diff)
downloadframeworks_base-40fea8b1bf689933e63941b5fa5e3379f82c88b5.zip
frameworks_base-40fea8b1bf689933e63941b5fa5e3379f82c88b5.tar.gz
frameworks_base-40fea8b1bf689933e63941b5fa5e3379f82c88b5.tar.bz2
am 4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
* commit '4b5da86d04200ba278b62ff99da91e212b87e9af': Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
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;