Making sure that the prefix is handled properly.
Change-Id: Ic50327b1ed4d6b54753b5b3887508a53cd7a3497
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index b5b29b5..b8623e7 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -4848,7 +4848,7 @@
* of ViewGroup that are responsible for arranging their children.
* @return The LayoutParams associated with this view
*/
- @ViewDebug.ExportedProperty(deepExport = true, category = "layout")
+ @ViewDebug.ExportedProperty(deepExport = true, prefix = "layout_")
public ViewGroup.LayoutParams getLayoutParams() {
return mLayoutParams;
}
diff --git a/core/java/android/view/ViewDebug.java b/core/java/android/view/ViewDebug.java
index 7908f36..2ca08ea 100644
--- a/core/java/android/view/ViewDebug.java
+++ b/core/java/android/view/ViewDebug.java
@@ -1377,9 +1377,8 @@
Object methodValue = method.invoke(view, (Object[]) null);
final Class<?> returnType = method.getReturnType();
final ExportedProperty property = sAnnotations.get(method);
- String fullName = (property.category().length() == 0) ?
- method.getName() :
- (property.category() + ":" + method.getName());
+ String categoryPrefix =
+ property.category().length() != 0 ? property.category() + ":" : "";
if (returnType == int.class) {
@@ -1390,7 +1389,8 @@
final FlagToString[] flagsMapping = property.flagMapping();
if (flagsMapping.length > 0) {
final int intValue = (Integer) methodValue;
- final String valuePrefix = prefix + fullName + '_';
+ final String valuePrefix =
+ categoryPrefix + prefix + method.getName() + '_';
exportUnrolledFlags(out, flagsMapping, intValue, valuePrefix);
}
@@ -1415,7 +1415,7 @@
}
} else if (returnType == int[].class) {
final int[] array = (int[]) methodValue;
- final String valuePrefix = prefix + fullName + '_';
+ final String valuePrefix = categoryPrefix + prefix + method.getName() + '_';
final String suffix = "()";
exportUnrolledArray(context, out, property, array, valuePrefix, suffix);
@@ -1429,7 +1429,7 @@
}
}
- writeEntry(out, prefix, fullName, "()", methodValue);
+ writeEntry(out, categoryPrefix + prefix, method.getName(), "()", methodValue);
} catch (IllegalAccessException e) {
} catch (InvocationTargetException e) {
}
@@ -1450,9 +1450,8 @@
Object fieldValue = null;
final Class<?> type = field.getType();
final ExportedProperty property = sAnnotations.get(field);
- String fullName = (property.category().length() == 0) ?
- field.getName() :
- (property.category() + ":" + field.getName());
+ String categoryPrefix =
+ property.category().length() != 0 ? property.category() + ":" : "";
if (type == int.class) {
@@ -1463,7 +1462,8 @@
final FlagToString[] flagsMapping = property.flagMapping();
if (flagsMapping.length > 0) {
final int intValue = field.getInt(view);
- final String valuePrefix = prefix + fullName + '_';
+ final String valuePrefix =
+ categoryPrefix + prefix + field.getName() + '_';
exportUnrolledFlags(out, flagsMapping, intValue, valuePrefix);
}
@@ -1486,7 +1486,7 @@
}
} else if (type == int[].class) {
final int[] array = (int[]) field.get(view);
- final String valuePrefix = prefix + fullName + '_';
+ final String valuePrefix = categoryPrefix + prefix + field.getName() + '_';
final String suffix = "";
exportUnrolledArray(context, out, property, array, valuePrefix, suffix);
@@ -1495,8 +1495,8 @@
return;
} else if (!type.isPrimitive()) {
if (property.deepExport()) {
- dumpViewProperties(context, field.get(view), out,
- prefix + property.prefix());
+ dumpViewProperties(context, field.get(view), out, prefix
+ + property.prefix());
continue;
}
}
@@ -1505,7 +1505,7 @@
fieldValue = field.get(view);
}
- writeEntry(out, prefix, fullName, "", fieldValue);
+ writeEntry(out, categoryPrefix + prefix, field.getName(), "", fieldValue);
} catch (IllegalAccessException e) {
}
}