Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5179484 authored by Mindy Pereira's avatar Mindy Pereira
Browse files

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
parent 6b5652f4

src/com/android/calculator2/Calculator.java

+6 −6
Original line number Diff line number Diff line
@@ -144,8 +144,8 @@ public class Calculator extends Activity implements PanelSwitcher.Listener, Logi 
    @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 @@ public class Calculator extends Activity implements PanelSwitcher.Listener, Logi 
    }



    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 @@ public class Calculator extends Activity implements PanelSwitcher.Listener, Logi 
                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;