diff options
4 files changed, 11 insertions, 23 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/properties/AndroidPropertyPage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/properties/AndroidPropertyPage.java index b956fdc..584d49f 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/properties/AndroidPropertyPage.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/properties/AndroidPropertyPage.java @@ -92,17 +92,6 @@ public class AndroidPropertyPage extends PropertyPage { mLibraryDependencies = new LibraryProperties(libraryGroup); - /* - * APK-SPLIT: This is not yet supported, so we hide the UI - Group g = new Group(top, SWT.NONE); - g.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - g.setLayout(new GridLayout(1, false)); - g.setText("APK Generation"); - - mSplitByDensity = new Button(g, SWT.CHECK); - mSplitByDensity.setText("One APK per density"); - -*/ // fill the ui fillUi(); @@ -188,13 +177,6 @@ public class AndroidPropertyPage extends PropertyPage { mIsLibrary.setSelection(state.isLibrary()); mLibraryDependencies.setContent(state, mPropertiesWorkingCopy); - - /* - * APK-SPLIT: This is not yet supported, so we hide the UI - // get the project settings - ApkSettings settings = currentSdk.getApkSettings(mProject); - mSplitByDensity.setSelection(settings.isSplitByDpi()); - */ } } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/properties/LibraryProperties.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/properties/LibraryProperties.java index 38b4425..a734b41 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/properties/LibraryProperties.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/properties/LibraryProperties.java @@ -347,7 +347,7 @@ final class LibraryProperties { } item.setData(data); item.setText(0, data.relativePath); - item.setImage( data.project != null ? mMatchIcon : mErrorIcon); + item.setImage(data.project != null ? mMatchIcon : mErrorIcon); item.setText(1, data.project != null ? data.project.getName() : "?"); } diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectProperties.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectProperties.java index 09a35c5..9d578c4 100644 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectProperties.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectProperties.java @@ -394,7 +394,7 @@ public class ProjectProperties implements IPropertySource { Matcher m = PATTERN_PROP.matcher(line); if (m.matches()) { - map.put(m.group(1), m.group(2)); + map.put(m.group(1), unescape(m.group(2))); } else { log.warning("Error parsing '%1$s': \"%2$s\" is not a valid syntax", propFile.getOsLocation(), @@ -430,7 +430,6 @@ public class ProjectProperties implements IPropertySource { return null; } - /** * Private constructor. * <p/> @@ -443,4 +442,12 @@ public class ProjectProperties implements IPropertySource { mProperties = map; mType = type; } + + private static String unescape(String value) { + return value.replaceAll("\\\\\\\\", "\\\\"); + } + + protected static String escape(String value) { + return value.replaceAll("\\\\", "\\\\\\\\"); + } } diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectPropertiesWorkingCopy.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectPropertiesWorkingCopy.java index 797b505..2d3f9b7 100644 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectPropertiesWorkingCopy.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectPropertiesWorkingCopy.java @@ -226,8 +226,7 @@ public class ProjectPropertiesWorkingCopy extends ProjectProperties { } } - value = value.replaceAll("\\\\", "\\\\\\\\"); - writer.write(String.format("%s=%s\n", key, value)); + writer.write(String.format("%s=%s\n", key, escape(value))); } /** |