From 81f74f4bc96ea4266cebe1b785d095558f540800 Mon Sep 17 00:00:00 2001 From: Deepanshu Gupta Date: Sat, 12 Oct 2013 18:37:19 -0700 Subject: [PATCH] Fix DatePicker and Calendar widget in layoutlib. Issue: https://code.google.com/p/android/issues/detail?id=59732 Change-Id: I281b3fdad88c591281a3645592c84f3e2cb61d09 --- tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java | 10 ++++++++-- 1 file 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 cd4f82bee925..294d743e8cf9 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. 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 = ""; -- 2.11.0