Add menu labels

  Bug: 8618169

Change-Id: Iea1ac7256450afd2870c144099459f32868c699f

1 files changed, 20 insertions, 3 deletions

diff --git a/src/com/android/camera/drawable/TextDrawable.java b/src/com/android/camera/drawable/TextDrawable.java
index 2e86364e7..ac5f1ce92 100644
--- a/src/com/android/camera/drawable/TextDrawable.java
+++ b/src/com/android/camera/drawable/TextDrawable.java
@@ -37,6 +37,10 @@ public class TextDrawable extends Drawable {
     private int mIntrinsicWidth;
     private int mIntrinsicHeight;
 
+    public TextDrawable(Resources res) {
+        this(res, "");
+    }
+
     public TextDrawable(Resources res, CharSequence text) {
         mText = text;
         mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
@@ -49,11 +53,24 @@ public class TextDrawable extends Drawable {
         mIntrinsicHeight = mPaint.getFontMetricsInt(null);
     }
 
+    public void setText(CharSequence txt) {
+        mText = txt;
+        if (txt == null) {
+            mIntrinsicWidth = 0;
+            mIntrinsicHeight = 0;
+        } else {
+            mIntrinsicWidth = (int) (mPaint.measureText(mText, 0, mText.length()) + .5);
+            mIntrinsicHeight = mPaint.getFontMetricsInt(null);
+        }
+    }
+
     @Override
     public void draw(Canvas canvas) {
-        Rect bounds = getBounds();
-        canvas.drawText(mText, 0, mText.length(),
-                bounds.centerX(), bounds.centerY(), mPaint);
+        if (mText != null) {
+            Rect bounds = getBounds();
+            canvas.drawText(mText, 0, mText.length(),
+                    bounds.centerX(), bounds.centerY(), mPaint);
+        }
     }
 
     @Override