Fix scrolling in formula window
Change-Id: Ie2b8c35793882a1cc2a9881aaf6f3cfea4dbf260
diff --git a/src/com/android/calculator2/CalculatorEditText.java b/src/com/android/calculator2/CalculatorEditText.java
index 4ff9678..b916a26 100644
--- a/src/com/android/calculator2/CalculatorEditText.java
+++ b/src/com/android/calculator2/CalculatorEditText.java
@@ -36,6 +36,7 @@
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.MotionEvent;
+import android.view.View;
import android.widget.EditText;
import android.widget.TextView;
@@ -43,7 +44,7 @@
* EditText adapted for Calculator display.
*/
-public class CalculatorEditText extends EditText {
+public class CalculatorEditText extends EditText implements View.OnLongClickListener{
private final ActionMode.Callback mPasteActionModeCallback =
@@ -114,14 +115,6 @@
private int mWidthConstraint = -1;
private OnTextSizeChangeListener mOnTextSizeChangeListener;
- final GestureDetector mLongTouchDetector =
- new GestureDetector(new GestureDetector.SimpleOnGestureListener() {
- @Override
- public void onLongPress(MotionEvent e) {
- startActionMode(mPasteActionModeCallback);
- }
- });
-
public CalculatorEditText(Context context) {
this(context, null);
}
@@ -146,6 +139,7 @@
// Paste ActionMode is triggered explicitly, not through
// setCustomSelectionActionModeCallback.
+ setOnLongClickListener(this);
if (isFocusable()) {
setMovementMethod(ScrollingMovementMethod.getInstance());
@@ -155,9 +149,10 @@
}
@Override
- public boolean onTouchEvent(MotionEvent e) {
- return mLongTouchDetector.onTouchEvent(e);
- };
+ public boolean onLongClick(View v) {
+ startActionMode(mPasteActionModeCallback);
+ return true;
+ }
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {