diff options
author | Xavier Ducrohet <xav@android.com> | 2011-02-07 21:30:53 -0800 |
---|---|---|
committer | Xavier Ducrohet <xav@android.com> | 2011-02-23 19:47:18 -0800 |
commit | 031d2f8b6db5bf7b249ae1c9a72915bf2d3a8d7b (patch) | |
tree | 1d1a79124aeadc198088be178a3dea7d8d804e5e /tools/layoutlib/create | |
parent | 4b52ec49fee79b0488d6a9eaaa4ea5d74ce90905 (diff) | |
download | frameworks_base-031d2f8b6db5bf7b249ae1c9a72915bf2d3a8d7b.zip frameworks_base-031d2f8b6db5bf7b249ae1c9a72915bf2d3a8d7b.tar.gz frameworks_base-031d2f8b6db5bf7b249ae1c9a72915bf2d3a8d7b.tar.bz2 |
LayoutLib: Adapt the HC layoutlib to GB. do not merge.
Change-Id: I0b2016987a65fabbc0ce7011514543349e9fb929
Diffstat (limited to 'tools/layoutlib/create')
-rw-r--r-- | tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java | 5 | ||||
-rw-r--r-- | tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java index eff6bbc..4b62e43 100644 --- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java +++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java @@ -94,13 +94,12 @@ public final class CreateInfo implements ICreateInfo { * The list of methods to rewrite as delegates. */ private final static String[] DELEGATE_METHODS = new String[] { - "android.app.Fragment#instantiate", //(Landroid/content/Context;Ljava/lang/String;Landroid/os/Bundle;)Landroid/app/Fragment;", "android.content.res.Resources$Theme#obtainStyledAttributes", "android.content.res.Resources$Theme#resolveAttribute", "android.graphics.BitmapFactory#finishDecode", "android.os.Handler#sendMessageAtTime", "android.os.Build#getString", - "android.view.LayoutInflater#rInflate", + "android.view.LayoutInflater#parseInclude", "android.view.View#isInEditMode", "com.android.internal.util.XmlUtils#convertValueToInt", // TODO: comment out once DelegateClass is working @@ -110,7 +109,6 @@ public final class CreateInfo implements ICreateInfo { * The list of classes on which to delegate all native methods. */ private final static String[] DELEGATE_CLASS_NATIVES = new String[] { - "android.animation.PropertyValuesHolder", "android.graphics.AvoidXfermode", "android.graphics.Bitmap", "android.graphics.BitmapFactory", @@ -150,7 +148,6 @@ public final class CreateInfo implements ICreateInfo { "android.graphics.Xfermode", "android.os.SystemClock", "android.util.FloatMath", - "libcore.icu.ICU", }; /** diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java index ce48069..0fce7ef 100644 --- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java +++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java @@ -68,7 +68,6 @@ public class Main { AsmAnalyzer aa = new AsmAnalyzer(log, osJarPath, agen, new String[] { // derived from "android.view.View", - "android.app.Fragment" }, new String[] { // include classes "android.*", // for android.R |