diff options
| author | Michael Kolb <kolby@google.com> | 2013-04-26 18:10:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-26 18:10:04 +0000 |
| commit | 132eb666756115e578dada36624b977ac4d10e38 (patch) | |
| tree | 9d61681d2c7a9c86c3e30d52e2f9db454760bee0 /src | |
| parent | 5ed7c697ded34de36f81c0fc4b61d6b46d76124a (diff) | |
| parent | e74be613be0991bc36e3841ba72fe9f787fe9291 (diff) | |
| download | android_packages_apps_Gallery2-132eb666756115e578dada36624b977ac4d10e38.tar.gz android_packages_apps_Gallery2-132eb666756115e578dada36624b977ac4d10e38.tar.bz2 android_packages_apps_Gallery2-132eb666756115e578dada36624b977ac4d10e38.zip | |
Merge "Don't render label on focus ring" into gb-ub-photos-bryce
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/ui/PieRenderer.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/camera/ui/PieRenderer.java b/src/com/android/camera/ui/PieRenderer.java index 9edc11182..a4e7eb044 100644 --- a/src/com/android/camera/ui/PieRenderer.java +++ b/src/com/android/camera/ui/PieRenderer.java @@ -293,6 +293,9 @@ public class PieRenderer extends OverlayRenderer if (mXFade != null) { mXFade.cancel(); } + if (mLabel != null) { + mLabel.setText(""); + } } setVisible(show); mHandler.sendEmptyMessage(show ? MSG_OPEN : MSG_CLOSE); @@ -513,6 +516,7 @@ public class PieRenderer extends OverlayRenderer canvas.restoreToCount(state); return; } + if (mState != STATE_PIE) return; if (!hasOpenItem() || (mXFade != null)) { // draw base menu drawArc(canvas, getLevel(), getParent()); |