summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2014-05-13 16:36:25 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-13 16:36:25 +0000
commit520f585bc6409b5c0024105a46b282245dad42e0 (patch)
tree619f9833df5258cb008a66dd31e5534de884028b /tools
parent2c167d0f6a370f9272ef24746222772586c1758c (diff)
parent2cbe100a9bc6d2b3bf828432a1527f0ac239e575 (diff)
downloadframeworks_base-520f585bc6409b5c0024105a46b282245dad42e0.zip
frameworks_base-520f585bc6409b5c0024105a46b282245dad42e0.tar.gz
frameworks_base-520f585bc6409b5c0024105a46b282245dad42e0.tar.bz2
am 2cbe100a: am 40fea8b1: am 4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
* commit '2cbe100a9bc6d2b3bf828432a1527f0ac239e575': Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
Diffstat (limited to 'tools')
-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;