diff options
| author | Tor Norbye <tnorbye@google.com> | 2012-11-02 08:13:14 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2012-11-02 08:14:37 -0700 |
| commit | 28d765c24ad1808bcd00c0e590cb34e29ff6ea2c (patch) | |
| tree | c2f6b151634425116b993daebbecbecca3e3addc /eclipse | |
| parent | 72eb6932b995d9627afd2659e9567ad84918047e (diff) | |
| download | sdk-28d765c24ad1808bcd00c0e590cb34e29ff6ea2c.zip sdk-28d765c24ad1808bcd00c0e590cb34e29ff6ea2c.tar.gz sdk-28d765c24ad1808bcd00c0e590cb34e29ff6ea2c.tar.bz2 | |
21296: Layout editor error when using numColumns attribute
Change-Id: I2d2542a1044b3b1d1682b125b45e223aa3d921fa
Diffstat (limited to 'eclipse')
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LayoutMetadata.java | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LayoutMetadata.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LayoutMetadata.java index 82172fc..94bd058 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LayoutMetadata.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LayoutMetadata.java @@ -22,6 +22,7 @@ import static com.android.SdkConstants.EXPANDABLE_LIST_VIEW; import static com.android.SdkConstants.GRID_VIEW; import static com.android.SdkConstants.LAYOUT_RESOURCE_PREFIX; import static com.android.SdkConstants.TOOLS_URI; +import static com.android.SdkConstants.VALUE_AUTO_FIT; import com.android.annotations.NonNull; import com.android.annotations.Nullable; @@ -341,10 +342,16 @@ public class LayoutMetadata { Element element = (Element) xmlNode; String columns = element.getAttributeNS(ANDROID_URI, ATTR_NUM_COLUMNS); int multiplier = 2; - if (columns != null && columns.length() > 0) { - int c = Integer.parseInt(columns); - if (c >= 1 && c <= 10) { - multiplier = c; + if (columns != null && columns.length() > 0 && + !columns.equals(VALUE_AUTO_FIT)) { + try { + int c = Integer.parseInt(columns); + if (c >= 1 && c <= 10) { + multiplier = c; + } + } catch (NumberFormatException nufe) { + // some unexpected numColumns value: just stick with 2 columns for + // preview purposes } } count *= multiplier; |