Add GCam progress indicator.

  Bug: 11505806

Change-Id: I823c44b3761bb3c6dce56b1ec1b8d667023da820

1 files changed, 12 insertions, 13 deletions

diff --git a/src/com/android/camera/ui/PieRenderer.java b/src/com/android/camera/ui/PieRenderer.java
index 3967f7946..58bee94d6 100644
--- a/src/com/android/camera/ui/PieRenderer.java
+++ b/src/com/android/camera/ui/PieRenderer.java
@@ -42,10 +42,13 @@ import android.view.animation.Transformation;
 import com.android.camera.drawable.TextDrawable;
 import com.android.camera2.R;
 
+/**
+ * An overlay renderer that is used to display focus state and progress state.
+ */
 public class PieRenderer extends OverlayRenderer
         implements FocusIndicator {
 
-    private static final String TAG = "CAM Pie";
+    private static final String TAG = "PieRenderer";
 
     // Sometimes continuous autofocus starts and stops several times quickly.
     // These states are used to make sure the animation is run for at least some
@@ -143,7 +146,7 @@ public class PieRenderer extends OverlayRenderer
     private int mAngleZone;
     private float mCenterAngle;
 
-
+    private ProgressRenderer mProgressRenderer;
 
     private Handler mHandler = new Handler() {
         public void handleMessage(Message msg) {
@@ -226,6 +229,7 @@ public class PieRenderer extends OverlayRenderer
         mLabel.setDropShadow(true);
         mDeadZone = res.getDimensionPixelSize(R.dimen.pie_deadzone_width);
         mAngleZone = res.getDimensionPixelSize(R.dimen.pie_anglezone_width);
+        mProgressRenderer = new ProgressRenderer(ctx);
     }
 
     private PieItem getRoot() {
@@ -308,6 +312,10 @@ public class PieRenderer extends OverlayRenderer
         return mState == STATE_PIE && isVisible();
     }
 
+    public void setProgress(int percent) {
+        mProgressRenderer.setProgress(percent);
+    }
+
     private void fadeIn() {
         mFadeIn = new ValueAnimator();
         mFadeIn.setFloatValues(0f, 1f);
@@ -517,6 +525,8 @@ public class PieRenderer extends OverlayRenderer
 
     @Override
     public void onDraw(Canvas canvas) {
+        mProgressRenderer.onDraw(canvas, mFocusX, mFocusY);
+
         float alpha = 1;
         if (mXFade != null) {
             alpha = (Float) mXFade.getAnimatedValue();
@@ -911,17 +921,6 @@ public class PieRenderer extends OverlayRenderer
         setCircle(mFocusX, mFocusY);
     }
 
-    public void alignFocus(int x, int y) {
-        mOverlay.removeCallbacks(mDisappear);
-        mAnimation.cancel();
-        mAnimation.reset();
-        mFocusX = x;
-        mFocusY = y;
-        mDialAngle = DIAL_HORIZONTAL;
-        setCircle(x, y);
-        mFocused = false;
-    }
-
     public int getSize() {
         return 2 * mCircleSize;
     }