Adding background protection for AllApps.
Change-Id: If4f8a2e80e1ceae6c84fcea58cc5fcc118aad25e
diff --git a/res/layout-xlarge/button_bar.xml b/res/layout-xlarge/button_bar.xml
index 6cd8e88..5c96c5c 100644
--- a/res/layout-xlarge/button_bar.xml
+++ b/res/layout-xlarge/button_bar.xml
@@ -89,7 +89,7 @@
android:focusable="false"
android:clickable="true" />
- <TextView
+ <com.android.launcher2.StrokedTextView
android:id="@+id/all_apps_button"
android:text="@string/all_apps_button_label"
android:drawablePadding="@dimen/all_apps_button_drawable_padding"
@@ -107,6 +107,10 @@
android:textColor="#CCFFFFFF"
android:textSize="18sp"
+ launcher:strokeColor="#991e3157"
+ launcher:strokeTextColor="#DDFFFFFF"
+ launcher:strokeWidth="2.5"
+
android:shadowColor="#DA000000"
android:shadowDx="0.0"
android:shadowDy="0.0"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 5e6a2ab..2be5999 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -61,6 +61,16 @@
</declare-styleable>
+ <!-- StrokedTextView specific attributes. -->
+ <declare-styleable name="StrokedTextView">
+ <!-- The color of the stroke outline -->
+ <attr name="strokeColor" format="color" />
+ <!-- The color of the text -->
+ <attr name="strokeTextColor" format="color" />
+ <!-- The width of the stroke -->
+ <attr name="strokeWidth" format="float" />
+ </declare-styleable>
+
<!-- PagedViewIcon specific attributes. These attributes are used to customize
a PagedViewIcon view in XML files. -->
<declare-styleable name="PagedViewIcon">
diff --git a/src/com/android/launcher2/StrokedTextView.java b/src/com/android/launcher2/StrokedTextView.java
new file mode 100644
index 0000000..20f9f48
--- /dev/null
+++ b/src/com/android/launcher2/StrokedTextView.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher2;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.widget.TextView;
+
+import com.android.launcher.R;
+
+/**
+ * This class adds a stroke to the generic TextView allowing the text to stand out better against
+ * the background (ie. in the AllApps button).
+ */
+public class StrokedTextView extends TextView {
+ private final Canvas mCanvas = new Canvas();
+ private final Paint mPaint = new Paint();
+ private Bitmap mCache;
+ private boolean mUpdateCachedBitmap;
+ private int mStrokeColor;
+ private float mStrokeWidth;
+ private int mTextColor;
+
+ public StrokedTextView(Context context) {
+ super(context);
+ init(context, null, 0);
+ }
+
+ public StrokedTextView(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ init(context, attrs, 0);
+ }
+
+ public StrokedTextView(Context context, AttributeSet attrs, int defStyle) {
+ super(context, attrs, defStyle);
+ init(context, attrs, defStyle);
+ }
+
+ private void init(Context context, AttributeSet attrs, int defStyle) {
+ TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.StrokedTextView,
+ defStyle, 0);
+ mStrokeColor = a.getColor(R.styleable.StrokedTextView_strokeColor, 0xFF000000);
+ mStrokeWidth = a.getFloat(R.styleable.StrokedTextView_strokeWidth, 0.0f);
+ mTextColor = a.getColor(R.styleable.StrokedTextView_strokeTextColor, 0xFFFFFFFF);
+ a.recycle();
+ mUpdateCachedBitmap = true;
+
+ // Setup the text paint
+ mPaint.setAntiAlias(true);
+ mPaint.setStyle(Paint.Style.FILL_AND_STROKE);
+ }
+
+ protected void onTextChanged(CharSequence text, int start, int before, int after) {
+ super.onTextChanged(text, start, before, after);
+ mUpdateCachedBitmap = true;
+ }
+
+ protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+ super.onSizeChanged(w, h, oldw, oldh);
+ if (w > 0 && h > 0) {
+ mUpdateCachedBitmap = true;
+ mCache = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
+ } else {
+ mCache = null;
+ }
+ }
+
+ protected void onDraw(Canvas canvas) {
+ if (mCache != null) {
+ if (mUpdateCachedBitmap) {
+ final int gap = getCompoundDrawablePadding();
+ final int w = getMeasuredWidth();
+ final int h = getMeasuredHeight();
+ final String text = getText().toString();
+ final Rect textBounds = new Rect();
+ final Paint textPaint = getPaint();
+ final int textWidth = (int) textPaint.measureText(text);
+ textPaint.getTextBounds("x", 0, 1, textBounds);
+
+ // Clear the old cached image
+ mCanvas.setBitmap(mCache);
+ mCanvas.drawColor(0, PorterDuff.Mode.CLEAR);
+
+ // Draw the drawable
+ final int drawableLeft = getPaddingLeft();
+ final int drawableTop = getPaddingTop();
+ final Drawable[] drawables = getCompoundDrawables();
+ for (int i = 0; i < drawables.length; ++i) {
+ if (drawables[i] != null) {
+ drawables[i].setBounds(drawableLeft, drawableTop,
+ drawableLeft + drawables[i].getIntrinsicWidth(),
+ drawableTop + drawables[i].getIntrinsicHeight());
+ drawables[i].draw(mCanvas);
+ }
+ }
+
+ final int left = w - getPaddingRight() - textWidth;
+ final int bottom = (h + textBounds.height()) / 2;
+
+ // Draw the outline of the text
+ mPaint.setStrokeWidth(mStrokeWidth);
+ mPaint.setColor(mStrokeColor);
+ mPaint.setTextSize(getTextSize());
+ mCanvas.drawText(text, left, bottom, mPaint);
+
+ // Draw the text itself
+ mPaint.setStrokeWidth(0);
+ mPaint.setColor(mTextColor);
+ mCanvas.drawText(text, left, bottom, mPaint);
+
+ mUpdateCachedBitmap = false;
+ }
+ canvas.drawBitmap(mCache, 0, 0, mPaint);
+ } else {
+ super.onDraw(canvas);
+ }
+ }
+}