commit 1b6b33b3816564dac3079ca3a3b49ed34f089f96
author mindyp <mindyp@google.com> Wed Sep 26 16:27:20 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 26 16:27:21 2012 -0700
tree f6d259895780286bb801e56121e639f19eca7e26
parent f4d403c1cf2a9abe231ec6e92fbca757bb8db592
parent 0d886f3cb76ce16f16bc85db9e6f4c928fdd6436

Merge "Fixup widths of clear/ delete buttons" into jb-mr1-dev

src/com/android/calculator2/ColorButton.java

diff --git a/src/com/android/calculator2/ColorButton.java b/src/com/android/calculator2/ColorButton.java
index c9bab40..7526e85 100644
--- a/src/com/android/calculator2/ColorButton.java
+++ b/src/com/android/calculator2/ColorButton.java
@@ -17,14 +17,10 @@
 package com.android.calculator2;
 
 import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Canvas;
 import android.graphics.Paint;
-import android.graphics.Paint.Style;
 import android.util.AttributeSet;
 import android.view.View.OnClickListener;
 import android.view.View;
-import android.view.MotionEvent;
 import android.widget.Button;
 
 /**
@@ -39,12 +35,10 @@
     float mTextY;
     long mAnimStart;
     OnClickListener mListener;
-    Paint mFeedbackPaint;
 
     public ColorButton(Context context, AttributeSet attrs) {
         super(context, attrs);
         Calculator calc = (Calculator) context;
-        init(calc);
         mListener = calc.mListener;
         setOnClickListener(this);
     }
@@ -53,19 +47,6 @@
         mListener.onClick(this);
     }
 
-    private void init(Calculator calc) {
-        Resources res = getResources();
-
-        CLICK_FEEDBACK_COLOR = res.getColor(R.color.magic_flame);
-        mFeedbackPaint = new Paint();
-        mFeedbackPaint.setStyle(Style.STROKE);
-        mFeedbackPaint.setStrokeWidth(2);
-        getPaint().setColor(res.getColor(R.color.button_text));
-
-        mAnimStart = -1;
-    }
-
-
     @Override
     public void onSizeChanged(int w, int h, int oldW, int oldH) {
         measureText();
@@ -81,58 +62,4 @@
     protected void onTextChanged(CharSequence text, int start, int before, int after) {
         measureText();
     }
-
-    private void drawMagicFlame(int duration, Canvas canvas) {
-        int alpha = 255 - 255 * duration / CLICK_FEEDBACK_DURATION;
-        int color = CLICK_FEEDBACK_COLOR | (alpha << 24);
-
-        mFeedbackPaint.setColor(color);
-        canvas.drawRect(1, 1, getWidth() - 1, getHeight() - 1, mFeedbackPaint);
-    }
-
-    @Override
-    public void onDraw(Canvas canvas) {
-        if (mAnimStart != -1) {
-            int animDuration = (int) (System.currentTimeMillis() - mAnimStart);
-
-            if (animDuration >= CLICK_FEEDBACK_DURATION) {
-                mAnimStart = -1;
-            } else {
-                drawMagicFlame(animDuration, canvas);
-                postInvalidateDelayed(CLICK_FEEDBACK_INTERVAL);
-            }
-        } else if (isPressed()) {
-            drawMagicFlame(0, canvas);
-        }
-
-        CharSequence text = getText();
-        canvas.drawText(text, 0, text.length(), mTextX, mTextY, getPaint());
-    }
-
-    public void animateClickFeedback() {
-        mAnimStart = System.currentTimeMillis();
-        invalidate();
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        boolean result = super.onTouchEvent(event);
-
-        switch (event.getAction()) {
-            case MotionEvent.ACTION_UP:
-                if (isPressed()) {
-                    animateClickFeedback();
-                } else {
-                    invalidate();
-                }
-                break;
-            case MotionEvent.ACTION_DOWN:
-            case MotionEvent.ACTION_CANCEL:
-                mAnimStart = -1;
-                invalidate();
-                break;
-        }
-
-        return result;
-    }
 }