diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-01-24 14:03:21 -0800 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2011-01-24 14:14:53 -0800 |
| commit | 82b9232565bfececdb643a94cecdd1bd1cb5c643 (patch) | |
| tree | 966746b27fd9d02ec000db9fc7be2c75628224be /tools/layoutlib/create | |
| parent | 67005b05cc76a38a5b3bf6e83957dd03619e9126 (diff) | |
| download | frameworks_base-82b9232565bfececdb643a94cecdd1bd1cb5c643.zip frameworks_base-82b9232565bfececdb643a94cecdd1bd1cb5c643.tar.gz frameworks_base-82b9232565bfececdb643a94cecdd1bd1cb5c643.tar.bz2 | |
LayoutLib: Use special view cookie for include-merge case.
All items directly under the <merge> tag now return the view cookie
of the referencing <include> tag using a special class for
easy differentiation in the calling client.
Change-Id: I7a2a4e642be9564f47e256fd1586012497d34792
Diffstat (limited to 'tools/layoutlib/create')
| -rw-r--r-- | tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java | 3 |
1 files changed, 2 insertions, 1 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 4198006..e3c5b4b 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 @@ -96,8 +96,9 @@ public final class CreateInfo implements ICreateInfo { 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.os.Handler#sendMessageAtTime", + "android.view.LayoutInflater#rInflate", "android.view.View#isInEditMode", - "com.android.internal.util.XmlUtils#convertValueToInt" + "com.android.internal.util.XmlUtils#convertValueToInt", // TODO: comment out once DelegateClass is working // "android.content.res.Resources$Theme#obtainStyledAttributes", }; |