Merge "Add TextView textSize as a ViewDebug for hierarchyviewer" into jb-dev

Fabrice Di Meglio · Android (Google) Code Review · commit 1b332dbffa54 · 2012-04-27T16:30:57.000-07:00
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
@@ -2148,6 +2148,7 @@ public void setTextAppearance(Context context, int resid) {
     /**
      * @return the size (in pixels) of the default text size in this TextView.
      */
+    @ViewDebug.ExportedProperty(category = "text")
     public float getTextSize() {
         return mTextPaint.getTextSize();
     }

Original file line number	Diff line number	Diff line change
`@@ -2148,6 +2148,7 @@ public void setTextAppearance(Context context, int resid) {`
`2148`	`2148`	`/**`
`2149`	`2149`	`* @return the size (in pixels) of the default text size in this TextView.`
`2150`	`2150`	`*/`
	`2151`	`+ @ViewDebug.ExportedProperty(category = "text")`
`2151`	`2152`	`public float getTextSize() {`
`2152`	`2153`	`return mTextPaint.getTextSize();`
`2153`	`2154`	`}`