Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 132eb666 authored by Michael Kolb's avatar Michael Kolb Committed by Android (Google) Code Review
Browse files

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

parents 5ed7c697 e74be613

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

+4 −0
Original line number Diff line number Diff line
@@ -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());