diff options
| author | Michael Kolb <kolby@google.com> | 2013-04-26 08:53:49 -0700 |
|---|---|---|
| committer | Michael Kolb <kolby@google.com> | 2013-04-26 08:53:49 -0700 |
| commit | 9e012f853e3eb5c9d36c84351961f588eef4788f (patch) | |
| tree | b1ea0f8e9af39e292e28fb498fcb89ebda5c5e97 /src/com/android/camera | |
| parent | 65a6fa8dca42b855efcfde4f8660d574b4c05e1f (diff) | |
| download | android_packages_apps_Snap-9e012f853e3eb5c9d36c84351961f588eef4788f.tar.gz android_packages_apps_Snap-9e012f853e3eb5c9d36c84351961f588eef4788f.tar.bz2 android_packages_apps_Snap-9e012f853e3eb5c9d36c84351961f588eef4788f.zip | |
Don't render label on focus ring
Bug: 8719036
Change-Id: If783b96aaa8c56fceb98cb52fceb9a8afda0d59a
Diffstat (limited to 'src/com/android/camera')
| -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()); |