diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-10-03 20:30:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-03 20:30:45 +0000 |
| commit | c74a2b343507546dd5b0a6be5afce42eb8b16a0d (patch) | |
| tree | 5fc7595e9ef8c2aa7509532a5aec9b4cc825a01d | |
| parent | 7caa51e6ec6443d5c1fdb96f7e42508b074b4278 (diff) | |
| parent | 3c8140ab4b39922f92682910ce24de77fd512db4 (diff) | |
| download | frameworks_base-c74a2b343507546dd5b0a6be5afce42eb8b16a0d.zip frameworks_base-c74a2b343507546dd5b0a6be5afce42eb8b16a0d.tar.gz frameworks_base-c74a2b343507546dd5b0a6be5afce42eb8b16a0d.tar.bz2 | |
Merge "Minor style changes." into lmp-dev
| -rw-r--r-- | tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java b/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java index 4a6a434..28a109d 100644 --- a/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java +++ b/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java @@ -159,7 +159,7 @@ public final class BridgeTypedArray extends TypedArray { return null; } // 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. Integer v = resolveEnumAttribute(index); return v == null ? mResourceData[index].getValue() : String.valueOf((int) v); @@ -197,7 +197,7 @@ public final class BridgeTypedArray extends TypedArray { } } catch (NumberFormatException e) { 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]), null); return defValue; @@ -221,7 +221,7 @@ public final class BridgeTypedArray extends TypedArray { } } catch (NumberFormatException e) { 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]), null); } |
