diff options
author | Andrew Flynn <flynn@google.com> | 2012-03-01 16:26:50 -0800 |
---|---|---|
committer | Andrew Flynn <flynn@google.com> | 2012-03-01 16:26:50 -0800 |
commit | 826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec (patch) | |
tree | 1ba6f2151cba45b5e7d07cd61a44f6b59a3f828f /src/com/android/launcher2/BubbleTextView.java | |
parent | ca83eeb0919b690350d86a9562f58a5a56d196bf (diff) | |
parent | a3e22d6a362260d5b81feefbc91e4757e3d58958 (diff) | |
download | android_packages_apps_Trebuchet-826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec.tar.gz android_packages_apps_Trebuchet-826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec.tar.bz2 android_packages_apps_Trebuchet-826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec.zip |
resolved conflicts for merge of a3e22d6a to master
Change-Id: I8770574acf86e280a9d15d4309686111260e09d9
Diffstat (limited to 'src/com/android/launcher2/BubbleTextView.java')
-rw-r--r-- | src/com/android/launcher2/BubbleTextView.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/launcher2/BubbleTextView.java b/src/com/android/launcher2/BubbleTextView.java index 6227611d8..b41a02e1e 100644 --- a/src/com/android/launcher2/BubbleTextView.java +++ b/src/com/android/launcher2/BubbleTextView.java @@ -178,6 +178,7 @@ public class BubbleTextView extends TextView { // The translate of scrollX and scrollY is necessary when drawing TextViews, because // they set scrollX and scrollY to large values to achieve centered text destCanvas.save(); + destCanvas.scale(getScaleX(), getScaleY(), getWidth() / 2, getHeight() / 2); destCanvas.translate(-getScrollX() + padding / 2, -getScrollY() + padding / 2); destCanvas.clipRect(clipRect, Op.REPLACE); draw(destCanvas); @@ -292,6 +293,14 @@ public class BubbleTextView extends TextView { canvas.translate(-scrollX, -scrollY); } } + + // If text is transparent, don't draw any shadow + if (getCurrentTextColor() == android.R.color.transparent) { + getPaint().clearShadowLayer(); + super.draw(canvas); + return; + } + // We enhance the shadow by drawing the shadow twice getPaint().setShadowLayer(SHADOW_LARGE_RADIUS, 0.0f, SHADOW_Y_OFFSET, SHADOW_LARGE_COLOUR); super.draw(canvas); |