merge from open-source master

Change-Id: Idf59c10780096b92c7c76b90bc34512dee2f978e

4 files changed, 2 insertions, 17 deletions

diff --git a/src/com/android/calculator2/Calculator.java b/src/com/android/calculator2/Calculator.java
index a871c00..768a317 100644
--- a/src/com/android/calculator2/Calculator.java
+++ b/src/com/android/calculator2/Calculator.java
@@ -41,7 +41,6 @@ public class Calculator extends Activity {
     private static final int CMD_BASIC_PANEL    = 2;
     private static final int CMD_ADVANCED_PANEL = 3;
 
-    private static final int HVGA_HEIGHT_PIXELS = 480;
     private static final int HVGA_WIDTH_PIXELS  = 320;
 
     static final int BASIC_PANEL    = 0;
diff --git a/src/com/android/calculator2/EventListener.java b/src/com/android/calculator2/EventListener.java
index 89c9ad8..42f356c 100644
--- a/src/com/android/calculator2/EventListener.java
+++ b/src/com/android/calculator2/EventListener.java
@@ -18,9 +18,6 @@ package com.android.calculator2;
 
 import android.view.View;
 import android.view.KeyEvent;
-import android.view.View.OnClickListener;
-import android.view.View.OnLongClickListener;
-import android.view.View.OnKeyListener;
 import android.widget.Button;
 
 class EventListener implements View.OnKeyListener, 
diff --git a/src/com/android/calculator2/Logic.java b/src/com/android/calculator2/Logic.java
index aab51f7..0e8c19f 100644
--- a/src/com/android/calculator2/Logic.java
+++ b/src/com/android/calculator2/Logic.java
@@ -16,12 +16,10 @@
 
 package com.android.calculator2;
 
-import android.view.View;
 import android.view.KeyEvent;
 import android.widget.Button;
 import android.widget.EditText;
 import android.content.Context;
-import android.content.res.Configuration;
 
 import org.javia.arity.Symbols;
 import org.javia.arity.SyntaxException;
@@ -32,8 +30,6 @@ class Logic {
     private Symbols mSymbols = new Symbols();
     private History mHistory;
     private String  mResult = "";
-    private Button mEqualButton;
-    private final String mEnterString;
     private boolean mIsError = false;
     private int mLineLength = 0;
 
@@ -53,8 +49,6 @@ class Logic {
         mHistory = history;
         mDisplay = display;
         mDisplay.setLogic(this);
-        mEqualButton = equalButton;
-        mEnterString = context.getText(R.string.enter).toString();
 
         clearWithHistory(false);
     }
diff --git a/src/com/android/calculator2/PanelSwitcher.java b/src/com/android/calculator2/PanelSwitcher.java
index 05be9d6..cc62848 100644
--- a/src/com/android/calculator2/PanelSwitcher.java
+++ b/src/com/android/calculator2/PanelSwitcher.java
@@ -23,9 +23,6 @@ import android.view.GestureDetector;
 import android.widget.FrameLayout;
 import android.content.Context;
 import android.util.AttributeSet;
-import android.os.Handler;
-
-import java.util.Map;
 
 class PanelSwitcher extends FrameLayout {
     private static final int MAJOR_MOVE = 60;
@@ -33,7 +30,6 @@ class PanelSwitcher extends FrameLayout {
 
     private GestureDetector mGestureDetector;
     private int mCurrentView;
-    private View mChild, mHistoryView;
     private View mChildren[] = new View[0];
 
     private int mWidth;
@@ -43,9 +39,8 @@ class PanelSwitcher extends FrameLayout {
     private TranslateAnimation inRight;
     private TranslateAnimation outRight;
 
-    private static final int NONE  = 1;
-    private static final int LEFT  = 2;
-    private static final int RIGHT = 3;
+    private static final int LEFT  = 1;
+    private static final int RIGHT = 2;
     private int mPreviousMove;
 
     public PanelSwitcher(Context context, AttributeSet attrs) {