diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-01-06 22:22:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-06 22:22:36 +0000 |
| commit | 2bd01ebfa99815d4fb6b4e77754146a22cf66d03 (patch) | |
| tree | 011f40d5cd52450bfc1b2c7e6872bd0217630d2a /tools/layoutlib/create | |
| parent | ebc2872929177c4780c68a0371a44c25f89a4f1f (diff) | |
| parent | 7ed145493d3f5bea32c567980f77cc42f613197e (diff) | |
| download | frameworks_base-2bd01ebfa99815d4fb6b4e77754146a22cf66d03.zip frameworks_base-2bd01ebfa99815d4fb6b4e77754146a22cf66d03.tar.gz frameworks_base-2bd01ebfa99815d4fb6b4e77754146a22cf66d03.tar.bz2 | |
am 7ed14549: am 7081a114: Merge "Add preferences rendering." into lmp-dev
* commit '7ed145493d3f5bea32c567980f77cc42f613197e':
Add preferences rendering.
Diffstat (limited to 'tools/layoutlib/create')
| -rw-r--r-- | tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java | 3 | ||||
| -rw-r--r-- | tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java | 1 |
2 files changed, 4 insertions, 0 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 a97d3ff..8a060b9 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 @@ -152,6 +152,8 @@ public final class CreateInfo implements ICreateInfo { "android.graphics.Typeface#getSystemFontConfigLocation", "android.os.Handler#sendMessageAtTime", "android.os.HandlerThread#run", + "android.preference.Preference#dispatchSetInitialValue", + "android.preference.Preference#getView", "android.text.format.DateFormat#is24HourFormat", "android.util.Xml#newPullParser", "android.view.Choreographer#getRefreshRate", @@ -273,6 +275,7 @@ public final class CreateInfo implements ICreateInfo { private final static String[] EXCLUDED_CLASSES = new String[] { + "android.preference.PreferenceActivity", "org.kxml2.io.KXmlParser" }; 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 cd3c39e..fa570c8 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 @@ -108,6 +108,7 @@ public class Main { "android.graphics.drawable.*", "android.content.*", "android.content.res.*", + "android.preference.*", "org.apache.harmony.xml.*", "com.android.internal.R**", "android.pim.*", // for datepicker |