Removing unnecessary workaround for padding on workspace icons.
Change-Id: I2ae6324e18db7b010c8d2ef5140e004da2f2b9f0
diff --git a/res/drawable-hdpi/focused_application_background.9.png b/res/drawable-hdpi/focused_application_background.9.png
index 7bf37ef..1b11492 100644
--- a/res/drawable-hdpi/focused_application_background.9.png
+++ b/res/drawable-hdpi/focused_application_background.9.png
Binary files differ
diff --git a/res/drawable-hdpi/pressed_application_background.9.png b/res/drawable-hdpi/pressed_application_background.9.png
index a6cbe94..ece27fd 100644
--- a/res/drawable-hdpi/pressed_application_background.9.png
+++ b/res/drawable-hdpi/pressed_application_background.9.png
Binary files differ
diff --git a/res/drawable-mdpi/focused_application_background.9.png b/res/drawable-mdpi/focused_application_background.9.png
index 9d09b41..b27d693 100644
--- a/res/drawable-mdpi/focused_application_background.9.png
+++ b/res/drawable-mdpi/focused_application_background.9.png
Binary files differ
diff --git a/res/drawable-mdpi/pressed_application_background.9.png b/res/drawable-mdpi/pressed_application_background.9.png
index b79536a..1fd727e 100644
--- a/res/drawable-mdpi/pressed_application_background.9.png
+++ b/res/drawable-mdpi/pressed_application_background.9.png
Binary files differ
diff --git a/res/drawable/pressed_application_background.9.png b/res/drawable/pressed_application_background.9.png
index b09f595..754af48 100644
--- a/res/drawable/pressed_application_background.9.png
+++ b/res/drawable/pressed_application_background.9.png
Binary files differ
diff --git a/src/com/android/launcher2/BubbleTextView.java b/src/com/android/launcher2/BubbleTextView.java
index 89a6303..113f35d 100644
--- a/src/com/android/launcher2/BubbleTextView.java
+++ b/src/com/android/launcher2/BubbleTextView.java
@@ -26,7 +26,6 @@
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 @@
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 @@
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;
@@ -166,20 +162,6 @@
}
@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();
if (mBackground != null) mBackground.setCallback(this);
