summaryrefslogtreecommitdiffstats
path: root/src/com/android/calculator2/Calculator.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/calculator2/Calculator.java')
-rw-r--r--src/com/android/calculator2/Calculator.java17
1 files changed, 14 insertions, 3 deletions
diff --git a/src/com/android/calculator2/Calculator.java b/src/com/android/calculator2/Calculator.java
index c7e14a4..84f92c8 100644
--- a/src/com/android/calculator2/Calculator.java
+++ b/src/com/android/calculator2/Calculator.java
@@ -32,7 +32,9 @@ import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
import android.animation.PropertyValuesHolder;
import android.app.Activity;
+import android.app.AlertDialog;
import android.content.ClipData;
+import android.content.DialogInterface;
import android.content.Intent;
import android.content.res.Resources;
import android.graphics.Color;
@@ -71,7 +73,8 @@ import java.io.ObjectOutput;
import java.io.ObjectOutputStream;
public class Calculator extends Activity
- implements OnTextSizeChangeListener, OnLongClickListener, CalculatorText.OnPasteListener {
+ implements OnTextSizeChangeListener, OnLongClickListener, CalculatorText.OnPasteListener,
+ AlertDialogFragment.OnClickListener {
/**
* Constant for an invalid resource id.
@@ -847,7 +850,15 @@ public class Calculator extends Activity
mFormulaText.setTranslationY(0.0f);
mFormulaText.requestFocus();
- }
+ }
+
+ @Override
+ public void onClick(AlertDialogFragment fragment, int which) {
+ if (which == DialogInterface.BUTTON_POSITIVE) {
+ // Timeout extension request.
+ mEvaluator.setLongTimeOut();
+ }
+ }
@Override
public boolean onCreateOptionsMenu(Menu menu) {
@@ -889,7 +900,7 @@ public class Calculator extends Activity
}
private void displayMessage(String s) {
- AlertDialogFragment.showMessageDialog(this, s);
+ AlertDialogFragment.showMessageDialog(this, s, null);
}
private void displayFraction() {