diff options
author | Andrew Flynn <flynn@google.com> | 2012-02-29 13:33:22 -0800 |
---|---|---|
committer | Andrew Flynn <flynn@google.com> | 2012-02-29 17:30:37 -0800 |
commit | 0dca1ec41479a74f8da080224fa0c7eacab674d6 (patch) | |
tree | bad4a2d319a11c4da938122bd994485a59d0dc2a /src/com/android/launcher2/BubbleTextView.java | |
parent | 79b79dd57911b9f79d4fb872e70d37ee90b0cc64 (diff) | |
download | android_packages_apps_Trebuchet-0dca1ec41479a74f8da080224fa0c7eacab674d6.tar.gz android_packages_apps_Trebuchet-0dca1ec41479a74f8da080224fa0c7eacab674d6.tar.bz2 android_packages_apps_Trebuchet-0dca1ec41479a74f8da080224fa0c7eacab674d6.zip |
New small/large screen division for Launcher.
Previously the dp division between the two was set at 600dp
(7" tablets). This has now been bumped up to 720dp
(10" tablets).
Change-Id: I1f0419e504fc3bb606156c1cf6fbe03956274184
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 dc498a403..ad3954124 100644 --- a/src/com/android/launcher2/BubbleTextView.java +++ b/src/com/android/launcher2/BubbleTextView.java @@ -176,6 +176,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); @@ -286,6 +287,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); |