drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Minor style changes." into lmp-dev

Browse Source
This commit is contained in:
Deepanshu Gupta
2014-10-03 20:30:43 +00:00
committed by Android (Google) Code Review
parent 7caa51e6ec 3c8140ab4b
commit c74a2b3435
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java
View File

@ -159,7 +159,7 @@ public final class BridgeTypedArray extends TypedArray {
return null; return null;
} }
// As unfortunate as it is, it's possible to use enums with all attribute formats, // As unfortunate as it is, it's possible to use enums with all attribute formats,
// not just integers/enums. So, we need to search the enums always. In case, // not just integers/enums. So, we need to search the enums always. In case
// enums are used, the returned value is an integer. // enums are used, the returned value is an integer.
Integer v = resolveEnumAttribute(index); Integer v = resolveEnumAttribute(index);
return v == null ? mResourceData[index].getValue() : String.valueOf((int) v); return v == null ? mResourceData[index].getValue() : String.valueOf((int) v);
@ -197,7 +197,7 @@ public final class BridgeTypedArray extends TypedArray {
} }
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
Bridge.getLog().warning(LayoutLog.TAG_RESOURCES_FORMAT, Bridge.getLog().warning(LayoutLog.TAG_RESOURCES_FORMAT,
String.format("\"%s\" in attribute \"%2$s\" is not a valid integer", String.format("\"%1$s\" in attribute \"%2$s\" is not a valid integer",
s, mNames[index]), s, mNames[index]),
null); null);
return defValue; return defValue;
@ -221,7 +221,7 @@ public final class BridgeTypedArray extends TypedArray {
} }
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
Bridge.getLog().warning(LayoutLog.TAG_RESOURCES_FORMAT, Bridge.getLog().warning(LayoutLog.TAG_RESOURCES_FORMAT,
String.format("\"%s\" in attribute \"%2$s\" cannot be converted to float.", String.format("\"%1$s\" in attribute \"%2$s\" cannot be converted to float.",
s, mNames[index]), s, mNames[index]),
null); null);
} }