Calculator: BACK key on Advanced panel moves to Basic panel.

BUG 1890261.

1 files changed, 12 insertions, 0 deletions

diff --git a/src/com/android/calculator2/Calculator.java b/src/com/android/calculator2/Calculator.java
index d90da65..f4d430e 100644
--- a/src/com/android/calculator2/Calculator.java
+++ b/src/com/android/calculator2/Calculator.java
@@ -24,6 +24,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.Window;
 import android.view.View;
+import android.view.KeyEvent;
 import android.widget.Button;
 import android.widget.ListView;
 import android.content.res.Configuration;
@@ -153,6 +154,17 @@ public class Calculator extends Activity {
         mPersist.save();
     }
 
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent keyEvent) {
+        if (keyCode == KeyEvent.KEYCODE_BACK 
+            && mPanelSwitcher.getCurrentIndex() == ADVANCED_PANEL) {
+            mPanelSwitcher.moveRight();
+            return true;
+        } else {
+            return super.onKeyDown(keyCode, keyEvent);
+        }
+    }
+
     static void log(String message) {
         if (LOG_ENABLED) {
             Log.v(LOG_TAG, message);