diff options
author | Xavier Ducrohet <xav@android.com> | 2011-06-14 18:20:38 -0700 |
---|---|---|
committer | Android Code Review <code-review@android.com> | 2011-06-14 18:20:38 -0700 |
commit | e9e8b3c9409193ecdc920fce0ae75f6e713be08c (patch) | |
tree | 41179f7c4e3ee43c07371120192de27e686ca149 /ide_common/src/com/android/ide/common | |
parent | ecc8a2e5308215d4a439c963dd6e551671bf6b3f (diff) | |
parent | df07f53c944af94abb91d2164c7e79d5b02697b9 (diff) | |
download | sdk-e9e8b3c9409193ecdc920fce0ae75f6e713be08c.zip sdk-e9e8b3c9409193ecdc920fce0ae75f6e713be08c.tar.gz sdk-e9e8b3c9409193ecdc920fce0ae75f6e713be08c.tar.bz2 |
Merge "Fix parsing of the styleable enum/flag attribute values."
Diffstat (limited to 'ide_common/src/com/android/ide/common')
-rw-r--r-- | ide_common/src/com/android/ide/common/resources/ValueResourceParser.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ide_common/src/com/android/ide/common/resources/ValueResourceParser.java b/ide_common/src/com/android/ide/common/resources/ValueResourceParser.java index e52c026..6bd085e 100644 --- a/ide_common/src/com/android/ide/common/resources/ValueResourceParser.java +++ b/ide_common/src/com/android/ide/common/resources/ValueResourceParser.java @@ -150,8 +150,10 @@ public final class ValueResourceParser extends DefaultHandler { String value = attributes.getValue(ATTR_VALUE); try { + // Integer.decode/parseInt can't deal with hex value > 0x7FFFFFFF so we + // use Long.decode instead. mCurrentDeclareStyleable.addValue(mCurrentAttribute, - name, Integer.decode(value)); + name, (int)(long)Long.decode(value)); } catch (NumberFormatException e) { // pass, we'll just ignore this value } |