diff options
author | Xavier Ducrohet <xav@android.com> | 2012-02-24 17:44:27 -0800 |
---|---|---|
committer | Xavier Ducrohet <xav@android.com> | 2012-02-24 19:36:50 -0800 |
commit | 2e00a07d401e4ce62fe59ad492acc86ef6601a66 (patch) | |
tree | fd4c6693856d3482eecb40552770b62b4de6d838 /eclipse | |
parent | 6fc9a628523c21b565f16b32c9afaa77e9e7d178 (diff) | |
download | sdk-2e00a07d401e4ce62fe59ad492acc86ef6601a66.zip sdk-2e00a07d401e4ce62fe59ad492acc86ef6601a66.tar.gz sdk-2e00a07d401e4ce62fe59ad492acc86ef6601a66.tar.bz2 |
Fix support for custom views in library on ADT's side.
Don't check for final field when parsing R.java (in libraries
fields are not final anymore) and fix a bug in the new
aaptparser which would return a failed to parse aapt error
when the output is empty.
Also add customview in library test app.
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 |