commit 56bcbf121b29a035fba68a87b0c77ffa9d12a845
author Annie Chin <afchin@google.com> Fri Sep 23 17:04:22 2016 -0700
committer Annie Chin <afchin@google.com> Wed Oct 12 17:23:51 2016 -0700
tree b7130caddce38b52b57c25e0de8014782c3e3bd3
parent fdc69f65ca2541712292bd2236fecf83779b2665

Accommodate unit tests.

Bug: 30416650

-Make some methods public for test access
-Add handling for KEYCODE_CLEAR
-Remove old tests

Change-Id: Icc180990b48e86d5a77d4b2ae6705927c540d10e

src/com/android/calculator2/Calculator.java

diff --git a/src/com/android/calculator2/Calculator.java b/src/com/android/calculator2/Calculator.java
index 38b7c22..d70b972 100644
--- a/src/com/android/calculator2/Calculator.java
+++ b/src/com/android/calculator2/Calculator.java
@@ -34,7 +34,6 @@
 import android.app.ActionBar;
 import android.app.Activity;
 import android.content.ClipData;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Resources;
@@ -481,6 +480,10 @@
                 mCurrentButton = mDeleteButton;
                 onDelete();
                 return true;
+            case KeyEvent.KEYCODE_CLEAR:
+                mCurrentButton = mClearButton;
+                onClear();
+                return true;
             default:
                 cancelIfEvaluating(false);
                 final int raw = event.getKeyCharacterMap().get(keyCode, event.getMetaState());