diff options
author | Deepanshu Gupta <deepanshu@google.com> | 2014-10-03 21:02:59 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-03 21:02:59 +0000 |
commit | 9a4aa495105c9bce5dc31a9175094577ec2dd958 (patch) | |
tree | 6f9c2a3fbc51cb77767fa882aae1340726f42af5 /tools/layoutlib | |
parent | d341344be0eb5e47b3d159ae354aa21294fd6bca (diff) | |
parent | c74a2b343507546dd5b0a6be5afce42eb8b16a0d (diff) | |
download | frameworks_base-9a4aa495105c9bce5dc31a9175094577ec2dd958.zip frameworks_base-9a4aa495105c9bce5dc31a9175094577ec2dd958.tar.gz frameworks_base-9a4aa495105c9bce5dc31a9175094577ec2dd958.tar.bz2 |
am c74a2b34: Merge "Minor style changes." into lmp-dev
* commit 'c74a2b343507546dd5b0a6be5afce42eb8b16a0d':
Minor style changes.
Diffstat (limited to 'tools/layoutlib')
-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); } |