summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2015-01-08 01:54:08 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-08 01:54:08 +0000
commit96cdef7b75bb8e29cef21d1f9258a4d0b71000e4 (patch)
tree4e86deb06f21d4237868e5ec4673c20bb3547cb9 /tools/layoutlib
parentd00d143fbf00be44defffb96a9f50c856435883a (diff)
parentf0da92bfda9a7b393cac87436173c1284c7d48be (diff)
downloadframeworks_base-96cdef7b75bb8e29cef21d1f9258a4d0b71000e4.zip
frameworks_base-96cdef7b75bb8e29cef21d1f9258a4d0b71000e4.tar.gz
frameworks_base-96cdef7b75bb8e29cef21d1f9258a4d0b71000e4.tar.bz2
am f0da92bf: am 169c11dd: Merge "Add missing DateFormat method." into lmp-mr1-dev automerge: 33b2de7
* commit 'f0da92bfda9a7b393cac87436173c1284c7d48be': Add missing DateFormat method.
Diffstat (limited to 'tools/layoutlib')
-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 8cd1a69..1e4f213 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;
+ }
}