diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-02-24 19:39:27 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-24 19:39:27 -0800 |
| commit | 9109f4c300ac241beaa6adec77844b81e8fc2552 (patch) | |
| tree | 784ecc7bd2546acf62e276904c0ba1ac33e5dba3 /eclipse | |
| parent | bdd03fb60693afb49fb05d72a6eece2590f6e04e (diff) | |
| parent | 2e00a07d401e4ce62fe59ad492acc86ef6601a66 (diff) | |
| download | sdk-9109f4c300ac241beaa6adec77844b81e8fc2552.zip sdk-9109f4c300ac241beaa6adec77844b81e8fc2552.tar.gz sdk-9109f4c300ac241beaa6adec77844b81e8fc2552.tar.bz2 | |
Merge "Fix support for custom views in library on ADT's side."
Diffstat (limited to 'eclipse')
2 files changed, 2 insertions, 2 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/AaptParser.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/AaptParser.java index c4aad6d..eb7e60d 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/AaptParser.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/AaptParser.java @@ -204,7 +204,7 @@ public final class AaptParser { return parseOutput(results.toArray(new String[size]), project); } - return true; + return false; } /** diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/CompiledResourcesMonitor.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/CompiledResourcesMonitor.java index 03744a3..fd6e174 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/CompiledResourcesMonitor.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/CompiledResourcesMonitor.java @@ -258,7 +258,7 @@ public final class CompiledResourcesMonitor implements IFileListener, IProjectLi for (Field f : inner.getDeclaredFields()) { // only process static final fields. int modifiers = f.getModifiers(); - if (Modifier.isStatic(modifiers) && Modifier.isFinal(modifiers)) { + if (Modifier.isStatic(modifiers)) { Class<?> type = f.getType(); if (type.isArray() && type.getComponentType() == int.class) { // if the object is an int[] we put it in the styleable map |