summaryrefslogtreecommitdiff
path: root/core/java/android/widget
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2012-04-27 16:30:57 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-27 16:30:57 -0700
commit1b332dbffa54afaa5cb2635cb59195db2e48cdb2 (patch)
tree7af5e536efcf6a9bb771cf528d6820175ebf3790 /core/java/android/widget
parent6ee3fe884987d9d9915a8fce3d149719a35e9acb (diff)
parentc54da1cef96454886967dfe72ed9873f23084b96 (diff)
Merge "Add TextView textSize as a ViewDebug for hierarchyviewer" into jb-dev
Diffstat (limited to 'core/java/android/widget')
-rw-r--r--core/java/android/widget/TextView.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 36b1cd6f03f0..b2ad25dd22ec 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -2148,6 +2148,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
/**
* @return the size (in pixels) of the default text size in this TextView.
*/
+ @ViewDebug.ExportedProperty(category = "text")
public float getTextSize() {
return mTextPaint.getTextSize();
}