summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2010-03-05 13:24:08 -0800
committerKenny Root <kroot@google.com>2010-03-05 13:26:59 -0800
commit970516430064068a1513b7489848339829b7971a (patch)
treef02a8f9fc5a2de76e0ca83ff67ff6cfb3bc6b659 /src
parent406d703fad8350791d8cc76e80531cb67ab81f69 (diff)
downloadandroid_packages_apps_Trebuchet-970516430064068a1513b7489848339829b7971a.tar.gz
android_packages_apps_Trebuchet-970516430064068a1513b7489848339829b7971a.tar.bz2
android_packages_apps_Trebuchet-970516430064068a1513b7489848339829b7971a.zip
Widen AllApps3D text to match Launcher
The AllApps3D text used to have a bubble shade for the application title to make it more visible over a translucent background of the desktop. This was later changed to a black background eliminating the need for the bubble surrounding the text. The majority of the bubble rectangle code was commented out leaving all of the padding still in effect. This caused application titles to wrap in varying places between Launcher and Launcher2. Padding changes solve this. Change-Id: Id67649562045f65b44409dfb81e6112a1f838143
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/Utilities.java9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/com/android/launcher2/Utilities.java b/src/com/android/launcher2/Utilities.java
index c83e7dbfd..7bc1e8255 100644
--- a/src/com/android/launcher2/Utilities.java
+++ b/src/com/android/launcher2/Utilities.java
@@ -234,7 +234,6 @@ final class Utilities {
private final TextPaint mTextPaint;
- private final float mBubblePadding;
private final RectF mBubbleRect = new RectF();
private final float mTextWidth;
@@ -253,18 +252,16 @@ final class Utilities {
final float scale = metrics.density;
mDensity = metrics.densityDpi;
- final float paddingLeft = 5.0f * scale;
- final float paddingRight = 5.0f * scale;
+ final float paddingLeft = 2.0f * scale;
+ final float paddingRight = 2.0f * scale;
final float cellWidth = resources.getDimension(R.dimen.title_texture_width);
- final float bubbleWidth = cellWidth - paddingLeft - paddingRight;
- mBubblePadding = 3.0f * scale;
RectF bubbleRect = mBubbleRect;
bubbleRect.left = 0;
bubbleRect.top = 0;
bubbleRect.right = (int) cellWidth;
- mTextWidth = bubbleWidth - mBubblePadding - mBubblePadding;
+ mTextWidth = cellWidth - paddingLeft - paddingRight;
TextPaint textPaint = mTextPaint = new TextPaint();
textPaint.setTypeface(Typeface.DEFAULT);