summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2011-06-21 11:03:29 -0700
committerXavier Ducrohet <xav@android.com>2011-06-21 11:03:29 -0700
commitfc511683b6647295cb645a0118d1b0afd575b3c3 (patch)
tree14d0c9916008cf406dc45c64ffd10f6e0c319de6
parente2b801e5a437d75151d70a90e73f5f110d8732dd (diff)
downloadframeworks_base-fc511683b6647295cb645a0118d1b0afd575b3c3.zip
frameworks_base-fc511683b6647295cb645a0118d1b0afd575b3c3.tar.gz
frameworks_base-fc511683b6647295cb645a0118d1b0afd575b3c3.tar.bz2
Add missing delegate to the layoutlib.
Change-Id: I8de5c1093052c40c0cd327a4d02b01651d3b76b5
-rw-r--r--tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java4
-rw-r--r--tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/android/BridgeXmlBlockParserTest.java2
2 files changed, 5 insertions, 1 deletions
diff --git a/tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java b/tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java
index 98f8529..a45e879 100644
--- a/tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java
+++ b/tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java
@@ -138,6 +138,10 @@ public class ICU_Delegate {
return "";
}
+ @LayoutlibDelegate
+ /*package*/ static String getScript(String locale) {
+ return "";
+ }
@LayoutlibDelegate
/*package*/ static String[] getISOLanguagesNative() {
diff --git a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/android/BridgeXmlBlockParserTest.java b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/android/BridgeXmlBlockParserTest.java
index 96436fe..865a008 100644
--- a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/android/BridgeXmlBlockParserTest.java
+++ b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/android/BridgeXmlBlockParserTest.java
@@ -38,7 +38,7 @@ public class BridgeXmlBlockParserTest extends TestCase {
public void testXmlBlockParser() throws Exception {
XmlPullParser parser = ParserFactory.create(
- getClass().getResourceAsStream("com/android/layoutlib/testdata/layout1.xml"),
+ getClass().getResourceAsStream("/com/android/layoutlib/testdata/layout1.xml"),
"layout1.xml");
parser = new BridgeXmlBlockParser(parser, null, false /* platformResourceFlag */);