summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Deepanshu Gupta <deepanshu@google.com> 2015-01-08 01:17:31 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-01-08 01:17:32 +0000
commit169c11dd39ec44364168785a7a83fb747e893c9a (patch)
treecc0f5e45c0620cb009852ac99e58b4265adfb0ab
parent565b6b415a18ee0b99af8cb693b980e57136282b (diff)
parent6aede34e246e03be618c30504fc2fc8b07f23225 (diff)
Merge "Add missing DateFormat method." into lmp-mr1-dev
-rw-r--r--tools/layoutlib/bridge/src/android/text/format/DateFormat_Delegate.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/layoutlib/bridge/src/android/text/format/DateFormat_Delegate.java b/tools/layoutlib/bridge/src/android/text/format/DateFormat_Delegate.java
index 8cd1a695eabc..1e4f213597e5 100644
--- a/tools/layoutlib/bridge/src/android/text/format/DateFormat_Delegate.java
+++ b/tools/layoutlib/bridge/src/android/text/format/DateFormat_Delegate.java
@@ -34,4 +34,9 @@ public class DateFormat_Delegate {
/*package*/ static boolean is24HourFormat(Context context) {
return false;
}
+
+ @LayoutlibDelegate
+ /*package*/ static boolean is24HourFormat(Context context, int userHandle) {
+ return false;
+ }
}