summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2014-04-22 23:15:05 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-22 23:15:05 +0000
commitbe06a4182b9ff44a276f56d04b907672ee9e149a (patch)
tree20805ee34627104c81516262478bff4cea514c01 /tools
parent2c423b22b42269c0652dff4155707cec823fbfc1 (diff)
parentcf5c3fc70d4dcd5dc3c6054d0f7415ded0070e4f (diff)
downloadframeworks_base-be06a4182b9ff44a276f56d04b907672ee9e149a.zip
frameworks_base-be06a4182b9ff44a276f56d04b907672ee9e149a.tar.gz
frameworks_base-be06a4182b9ff44a276f56d04b907672ee9e149a.tar.bz2
am cf5c3fc7: am 53b7df19: Merge "Add missing ICU_Delegate methods."
* commit 'cf5c3fc70d4dcd5dc3c6054d0f7415ded0070e4f': Add missing ICU_Delegate methods.
Diffstat (limited to 'tools')
-rw-r--r--tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java b/tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java
index 998b08b..0f66fd7 100644
--- a/tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java
+++ b/tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java
@@ -247,4 +247,14 @@ public class ICU_Delegate {
return true;
}
+
+ @LayoutlibDelegate
+ /*package*/ static void setDefaultLocale(String locale) {
+ ICU.setDefaultLocale(locale);
+ }
+
+ @LayoutlibDelegate
+ /*package*/ static String getDefaultLocale() {
+ return ICU.getDefaultLocale();
+ }
}