commit 04f79c7a5f46f6c2cf07a164ce352ab54dfe7f47
author Justin Klaassen <justinklaassen@google.com> Fri Jun 27 17:25:35 2014 -0700
committer Justin Klaassen <justinklaassen@google.com> Fri Jun 27 17:25:35 2014 -0700
tree b9904e0b9ebe40aca33aa18c0127f0a047837d49
parent 1bb7ce445c55b38f7b45d3b4adb5161cc43130e6

Rename CalculatorActivity back to Calculator

Bug: 15907395
Change-Id: Idc3445230c541bdf50cc3b15187c0776010ccff3

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6218374..3a03059 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -25,7 +25,7 @@
         android:theme="@style/CalculatorTheme">
 
         <activity
-            android:name="com.android.calculator2.CalculatorActivity"
+            android:name=".Calculator"
             android:label="@string/app_name"
             android:windowSoftInputMode="stateAlwaysHidden">
             <intent-filter>

src/com/android/calculator2/Calculator.java

diff --git a/src/com/android/calculator2/CalculatorActivity.java b/src/com/android/calculator2/Calculator.java
similarity index 97%
rename from src/com/android/calculator2/CalculatorActivity.java
rename to 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 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 @@
         @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);
         }
     };