Merge "Translate the rest of the math functions." into jb-dev
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 {