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

Merge change 3227 into donut

Browse Source 
* changes:
  Fix int to string mapping of exported properties. The value generated by the mapping in a @ViewDebug.ExportedProperty annotation was always overriden by the resolveId attribute.
This commit is contained in:
Android (Google) Code Review
2009-06-04 15:12:06 -07:00
parent a80cc6ebe7 a1f3e4aef1
commit ad8a510fcc
2 changed files with 50 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/view/ViewDebug.java
View File

@ -1260,7 +1260,7 @@ public class ViewDebug {
for (int j = 0; j < valuesCount; j++) {
String name;
String value;
String value = null;
final int intValue = array[j];
@ -1276,7 +1276,6 @@ public class ViewDebug {
}
}
value = String.valueOf(intValue);
if (hasMapping) {
int mappingCount = mapping.length;
for (int k = 0; k < mappingCount; k++) {
@ -1289,7 +1288,9 @@ public class ViewDebug {
}
if (resolveId) {
value = (String) resolveId(context, intValue);
if (value == null) value = (String) resolveId(context, intValue);
} else {
value = String.valueOf(intValue);
}
writeEntry(out, prefix, name, suffix, value);

2
core/java/android/widget/RelativeLayout.java
View File

@ -881,7 +881,7 @@ public class RelativeLayout extends ViewGroup {
@ViewDebug.IntToString(from = RIGHT_OF, to = "rightOf")
}, mapping = {
@ViewDebug.IntToString(from = TRUE, to = "true"),
@ViewDebug.IntToString(from = 0, to = "FALSE/NO_ID")
@ViewDebug.IntToString(from = 0, to = "false/NO_ID")
})
private int[] mRules = new int[VERB_COUNT];