commit e5179484230da096d6f681eee2f488d582b7fa9f
author Mindy Pereira <mindyp@google.com> Wed Sep 14 13:09:57 2011 -0700
committer Mindy Pereira <mindyp@google.com> Wed Sep 14 13:09:57 2011 -0700
tree e756f39456c757e73eb7fe4ae1c9925d95fb6098
parent 6b5652f41a22c6e50a6d9d8bcf7adc9cb0be001c

Fix back behavior/ switching to advanced.

The getBasicVisibility and getAdvancedVisibility methods were backwards
This happened as a result of recent changes, probably to the view pager.

Fixes bug:5318179 Cannot close Calculator app clicking the back key.

Change-Id: Id1552b9f25ddd5a2eec700e0d9c9b3d7c4baab6c

src/com/android/calculator2/Calculator.java

diff --git a/src/com/android/calculator2/Calculator.java b/src/com/android/calculator2/Calculator.java
index 97486a8..51aa38a 100644
--- a/src/com/android/calculator2/Calculator.java
+++ b/src/com/android/calculator2/Calculator.java
@@ -144,8 +144,8 @@
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
-        menu.findItem(R.id.basic).setVisible(getBasicVisibility());
-        menu.findItem(R.id.advanced).setVisible(getAdvancedVisibility());
+        menu.findItem(R.id.basic).setVisible(!getBasicVisibility());
+        menu.findItem(R.id.advanced).setVisible(!getAdvancedVisibility());
         return true;
     }
 
@@ -186,11 +186,11 @@
     }
 
     private boolean getBasicVisibility() {
-        return mPager != null && mPager.getCurrentItem() == ADVANCED_PANEL;
+        return mPager != null && mPager.getCurrentItem() == BASIC_PANEL;
     }
 
     private boolean getAdvancedVisibility() {
-        return mPager != null && mPager.getCurrentItem() == BASIC_PANEL;
+        return mPager != null && mPager.getCurrentItem() == ADVANCED_PANEL;
     }
 
     @Override
@@ -202,13 +202,13 @@
                 break;
 
             case R.id.basic:
-                if (getAdvancedVisibility()) {
+                if (!getBasicVisibility()) {
                     mPager.setCurrentItem(BASIC_PANEL);
                 }
                 break;
 
             case R.id.advanced:
-                if (getBasicVisibility()) {
+                if (!getAdvancedVisibility()) {
                     mPager.setCurrentItem(ADVANCED_PANEL);
                 }
                 break;