diff options
| author | Justin Klaassen <justinklaassen@google.com> | 2014-06-27 17:25:35 -0700 |
|---|---|---|
| committer | Justin Klaassen <justinklaassen@google.com> | 2014-06-27 17:25:35 -0700 |
| commit | 04f79c7a5f46f6c2cf07a164ce352ab54dfe7f47 (patch) | |
| tree | b9904e0b9ebe40aca33aa18c0127f0a047837d49 /src/com/android | |
| parent | 1bb7ce445c55b38f7b45d3b4adb5161cc43130e6 (diff) | |
| download | android_packages_apps_ExactCalculator-04f79c7a5f46f6c2cf07a164ce352ab54dfe7f47.tar.gz android_packages_apps_ExactCalculator-04f79c7a5f46f6c2cf07a164ce352ab54dfe7f47.tar.bz2 android_packages_apps_ExactCalculator-04f79c7a5f46f6c2cf07a164ce352ab54dfe7f47.zip | |
Rename CalculatorActivity back to Calculator
Bug: 15907395
Change-Id: Idc3445230c541bdf50cc3b15187c0776010ccff3
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/calculator2/Calculator.java (renamed from src/com/android/calculator2/CalculatorActivity.java) | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/calculator2/CalculatorActivity.java b/src/com/android/calculator2/Calculator.java index 300e94f..256cf4e 100644 --- a/src/com/android/calculator2/CalculatorActivity.java +++ b/src/com/android/calculator2/Calculator.java @@ -43,11 +43,11 @@ import android.widget.TextView; import com.android.calculator2.CalculatorEditText.OnTextSizeChangeListener; import com.android.calculator2.CalculatorExpressionEvaluator.EvaluateCallback; -public class CalculatorActivity extends Activity +public class Calculator extends Activity implements OnTextSizeChangeListener, EvaluateCallback, OnLongClickListener { public static final String CALCULATOR_ACTIVITY_CURRENT_STATE = - CalculatorActivity.class.getSimpleName() + "_currentState"; + Calculator.class.getSimpleName() + "_currentState"; private enum CalculatorState { INPUT, EVALUATE, RESULT, ERROR @@ -65,14 +65,14 @@ public class CalculatorActivity extends Activity @Override public void afterTextChanged(Editable editable) { setState(CalculatorState.INPUT); - mEvaluator.evaluate(editable, CalculatorActivity.this); + mEvaluator.evaluate(editable, Calculator.this); } }; private final Editable.Factory mFormulaEditableFactory = new Editable.Factory() { @Override public Editable newEditable(CharSequence source) { - return new CalculatorExpressionBuilder(CalculatorActivity.this, source, + return new CalculatorExpressionBuilder(Calculator.this, source, mCurrentState == CalculatorState.INPUT); } }; |