summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/AutoFitTextView.java
diff options
context:
space:
mode:
authorTyson Miller <tmiller@cyngn.com>2015-11-10 08:59:15 -0800
committerArtem Shvadskiy <ashvadskiy@cyngn.com>2016-01-13 12:33:59 -0800
commit1792a57516c52145db6dcadb247bce452410b98c (patch)
tree86656bb6c7b3119cf4c70e07303740ce091d980b /src/com/android/launcher3/AutoFitTextView.java
parent892fafe5b66d33746fe72bf51ed015772646a223 (diff)
downloadandroid_packages_apps_Trebuchet-1792a57516c52145db6dcadb247bce452410b98c.tar.gz
android_packages_apps_Trebuchet-1792a57516c52145db6dcadb247bce452410b98c.tar.bz2
android_packages_apps_Trebuchet-1792a57516c52145db6dcadb247bce452410b98c.zip
Merge Remote Folder into mainline.
Patch 1: Squash. Patch 2: Remove obsolete code. Patch 3: Clean rebase. Patch 4: Fix commit message. Change-Id: Ie9c634d7d2f0824b3b1de84e8f0af5442e5511cc
Diffstat (limited to 'src/com/android/launcher3/AutoFitTextView.java')
-rw-r--r--src/com/android/launcher3/AutoFitTextView.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/launcher3/AutoFitTextView.java b/src/com/android/launcher3/AutoFitTextView.java
index 208dd4073..3d6b65894 100644
--- a/src/com/android/launcher3/AutoFitTextView.java
+++ b/src/com/android/launcher3/AutoFitTextView.java
@@ -143,6 +143,14 @@ public class AutoFitTextView extends TextView {
setRawTextSize(TypedValue.applyDimension(unit, size, r.getDisplayMetrics()));
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void setTextSize(float size) {
+ setRawTextSize(size);
+ }
+
private void setRawTextSize(float size) {
if (size != mMaxTextSize) {
mMaxTextSize = size;