diff options
2 files changed, 10 insertions, 6 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ResourceManagerBuilder.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ResourceManagerBuilder.java index 1aeb19f..fe6ac8a 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ResourceManagerBuilder.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ResourceManagerBuilder.java @@ -198,7 +198,9 @@ public class ResourceManagerBuilder extends BaseBuilder { javaProject.setRawClasspath(entries, new SubProgressMonitor(monitor, 10)); } - // refresh the whole project + // refresh sepcifcally the gen folder first, as it may break the build + // if it doesn't arrive in time then refresh the whole project as usual. + genFolder.refreshLocal(IResource.DEPTH_ZERO, new SubProgressMonitor(monitor, 10)); project.refreshLocal(IResource.DEPTH_INFINITE, new SubProgressMonitor(monitor, 10)); } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationComposite.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationComposite.java index f3bf078..6b648e2 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationComposite.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationComposite.java @@ -213,11 +213,13 @@ public class ConfigurationComposite extends Composite { locale = new ResourceQualifier[2]; String locales[] = values[2].split(SEP_LOCALE); - if (locales[0].length() > 0) { - locale[0] = new LanguageQualifier(locales[0]); - } - if (locales[1].length() > 0) { - locale[1] = new RegionQualifier(locales[1]); + if (locales.length >= 2) { + if (locales[0].length() > 0) { + locale[0] = new LanguageQualifier(locales[0]); + } + if (locales[1].length() > 0) { + locale[1] = new RegionQualifier(locales[1]); + } } theme = values[3]; |