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

Commit c3076425 authored by Adam Powell's avatar Adam Powell
Browse files

Fix bug 4520517 - IllegalStateException entering tab mode 

Change-Id: I0ebf3aea98060e27e9687f48dff05f7310046ce5
parent 287bd83f

core/java/com/android/internal/widget/ActionBarView.java

+2 −2
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ public class ActionBarView extends AbsActionBarView { 
    public void setEmbeddedTabView(ScrollingTabContainerView tabs) {

        mTabScrollView = tabs;

        mIncludeTabs = tabs != null;

        if (mIncludeTabs) {

        if (mIncludeTabs && mNavigationMode == ActionBar.NAVIGATION_MODE_TABS) {

            addView(mTabScrollView);

        }

    }
@@ -517,7 +517,7 @@ public class ActionBarView extends AbsActionBarView { 
        if (mode != oldMode) {

            switch (oldMode) {

            case ActionBar.NAVIGATION_MODE_LIST:

                if (mSpinner != null) {

                if (mListNavLayout != null) {

                    removeView(mListNavLayout);

                }

                break;