commit 132eb666756115e578dada36624b977ac4d10e38
author Michael Kolb <kolby@google.com> Fri Apr 26 18:10:03 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 26 18:10:04 2013 +0000
tree 9d61681d2c7a9c86c3e30d52e2f9db454760bee0
parent 5ed7c697ded34de36f81c0fc4b61d6b46d76124a
parent e74be613be0991bc36e3841ba72fe9f787fe9291

Merge "Don't render label on focus ring" into gb-ub-photos-bryce

src/com/android/camera/ui/PieRenderer.java

diff --git a/src/com/android/camera/ui/PieRenderer.java b/src/com/android/camera/ui/PieRenderer.java
index 9edc111..a4e7eb0 100644
--- a/src/com/android/camera/ui/PieRenderer.java
+++ b/src/com/android/camera/ui/PieRenderer.java
@@ -293,6 +293,9 @@
             if (mXFade != null) {
                 mXFade.cancel();
             }
+            if (mLabel != null) {
+                mLabel.setText("");
+            }
         }
         setVisible(show);
         mHandler.sendEmptyMessage(show ? MSG_OPEN : MSG_CLOSE);
@@ -513,6 +516,7 @@
             canvas.restoreToCount(state);
             return;
         }
+        if (mState != STATE_PIE) return;
         if (!hasOpenItem() || (mXFade != null)) {
             // draw base menu
             drawArc(canvas, getLevel(), getParent());