commit e86c5b2e9fe79f2a6f4187b6a4f2769c0b64168b
author Xavier Ducrohet <xav@android.com> Tue Jun 21 12:19:07 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 21 12:19:07 2011 -0700
tree 607c8bedafd3f300962d776b97ee84a209917690
parent 157c74e7ace77ae026cb59f48e400fb4ffe3c529
parent fc511683b6647295cb645a0118d1b0afd575b3c3

Merge "Add missing delegate to the layoutlib."

tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java

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 @@
         return "";
     }
 
+    @LayoutlibDelegate
+    /*package*/ static String getScript(String locale) {
+        return "";
+    }
 
     @LayoutlibDelegate
     /*package*/ static String[] getISOLanguagesNative() {

tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/android/BridgeXmlBlockParserTest.java

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 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 */);