Remove UTC offset from database. Fix clear history.
Bug: 32947084
Also add (currently unused) timestamp index.
The higher level "clear history" code needs work. This seems to work,
but hasn't been thought through very well. It was added mostly so
that I could actually test the ExpressionDB code.
This may require users to clear app data, but I seemed to get away
without it. You may just end up with an extra column if you don't.
Change-Id: Ibd2401a19d73c4824f549befd65a5c63633a894b
diff --git a/src/com/android/calculator2/Calculator.java b/src/com/android/calculator2/Calculator.java
index ee39f9d..ce80507 100644
--- a/src/com/android/calculator2/Calculator.java
+++ b/src/com/android/calculator2/Calculator.java
@@ -1002,6 +1002,14 @@
mResultText.announceForAccessibility(getResources().getString(R.string.cleared));
}
+ public void onClearAnimationEnd() {
+ mUnprocessedChars = null;
+ mResultText.clear();
+ mEvaluator.clearMain();
+ setState(CalculatorState.INPUT);
+ redisplayFormula();
+ }
+
private void onClear() {
if (mEvaluator.getExpr(Evaluator.MAIN_INDEX).isEmpty() && !haveUnprocessed()) {
return;
@@ -1011,12 +1019,8 @@
reveal(mCurrentButton, R.color.calculator_accent_color, new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
- mUnprocessedChars = null;
- mResultText.clear();
- mEvaluator.clearMain();
- setState(CalculatorState.INPUT);
+ onClearAnimationEnd();
showOrHideToolbar();
- redisplayFormula();
}
});
}