diff --git a/res/drawable-hdpi/focused_application_background.9.png b/res/drawable-hdpi/focused_application_background.9.png index 7bf37efed5..1b1149268f 100644 Binary files a/res/drawable-hdpi/focused_application_background.9.png and b/res/drawable-hdpi/focused_application_background.9.png differ diff --git a/res/drawable-hdpi/pressed_application_background.9.png b/res/drawable-hdpi/pressed_application_background.9.png index a6cbe94410..ece27fd978 100644 Binary files a/res/drawable-hdpi/pressed_application_background.9.png and b/res/drawable-hdpi/pressed_application_background.9.png differ diff --git a/res/drawable-mdpi/focused_application_background.9.png b/res/drawable-mdpi/focused_application_background.9.png index 9d09b41f1d..b27d69331c 100644 Binary files a/res/drawable-mdpi/focused_application_background.9.png and b/res/drawable-mdpi/focused_application_background.9.png differ diff --git a/res/drawable-mdpi/pressed_application_background.9.png b/res/drawable-mdpi/pressed_application_background.9.png index b79536a708..1fd727e9f2 100644 Binary files a/res/drawable-mdpi/pressed_application_background.9.png and b/res/drawable-mdpi/pressed_application_background.9.png differ diff --git a/res/drawable/pressed_application_background.9.png b/res/drawable/pressed_application_background.9.png index b09f595b78..754af48224 100644 Binary files a/res/drawable/pressed_application_background.9.png and b/res/drawable/pressed_application_background.9.png differ diff --git a/src/com/android/launcher2/BubbleTextView.java b/src/com/android/launcher2/BubbleTextView.java index 89a6303b41..113f35dd8e 100644 --- a/src/com/android/launcher2/BubbleTextView.java +++ b/src/com/android/launcher2/BubbleTextView.java @@ -26,7 +26,6 @@ import android.graphics.RectF; import android.graphics.drawable.Drawable; import android.text.Layout; import android.util.AttributeSet; -import android.view.View.MeasureSpec; import com.android.launcher.R; @@ -40,8 +39,6 @@ public class BubbleTextView extends CacheableTextView { static final float PADDING_H = 8.0f; static final float PADDING_V = 3.0f; - private int mAppCellWidth; - private final RectF mRect = new RectF(); private Paint mPaint; private float mBubbleColorAlpha; @@ -78,7 +75,6 @@ public class BubbleTextView extends CacheableTextView { mPaint = new Paint(Paint.ANTI_ALIAS_FLAG); mPaint.setColor(bubbleColor); mBubbleColorAlpha = Color.alpha(bubbleColor) / 255.0f; - mAppCellWidth = (int) res.getDimension(R.dimen.app_icon_size); final float scale = res.getDisplayMetrics().density; mCornerRadius = CORNER_RADIUS * scale; @@ -165,20 +161,6 @@ public class BubbleTextView extends CacheableTextView { super.draw(canvas); } - @Override - protected void onSizeChanged(int w, int h, int oldw, int oldh) { - if (w > 0 && h > 0) { - // Temporary Workaround: We need to set padding to compress the text so that we can draw - // a hotdog around it. Currently, the background images prevent us from applying the - // padding in XML, so we are doing this programmatically - int d = w - mAppCellWidth; - int pL = d - (d / 2); - int pR = d - pL; - setPadding(pL, getPaddingTop(), pR, getPaddingBottom()); - } - super.onSizeChanged(w, h, oldw, oldh); - } - @Override protected void onAttachedToWindow() { super.onAttachedToWindow();