commit c9cbc2f14461a454eb136e1da68db18c4c3c54ae
author Mindy Pereira <mindyp@google.com> Thu May 03 13:41:39 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 03 13:41:39 2012 -0700
tree 21db8d8207baa06498543f99fb41543cce66eaf2
parent 6702e4b5d52ec458a18ecc1382d020debedb2a8f
parent caccbfbeaf0c42b86b6e26ff48c18c4fc136e28f

Merge "Translate from translated languages to MATH." into jb-dev

src/com/android/calculator2/Calculator.java

diff --git a/src/com/android/calculator2/Calculator.java b/src/com/android/calculator2/Calculator.java
index 51aa38a..18b676c 100644
--- a/src/com/android/calculator2/Calculator.java
+++ b/src/com/android/calculator2/Calculator.java
@@ -202,13 +202,13 @@
                 break;
 
             case R.id.basic:
-                if (!getBasicVisibility()) {
+                if (!getBasicVisibility() && mPager != null) {
                     mPager.setCurrentItem(BASIC_PANEL);
                 }
                 break;
 
             case R.id.advanced:
-                if (!getAdvancedVisibility()) {
+                if (!getAdvancedVisibility() && mPager != null) {
                     mPager.setCurrentItem(ADVANCED_PANEL);
                 }
                 break;
@@ -234,7 +234,8 @@
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent keyEvent) {
-        if (keyCode == KeyEvent.KEYCODE_BACK && getAdvancedVisibility()) {
+        if (keyCode == KeyEvent.KEYCODE_BACK && getAdvancedVisibility()
+                && mPager != null) {
             mPager.setCurrentItem(BASIC_PANEL);
             return true;
         } else {