commit 0458796f1401732b38660794148f4c5e5602f432
author Adam Powell <adamp@google.com> Thu Nov 11 22:15:07 2010 -0800
committer Adam Powell <adamp@google.com> Thu Nov 11 22:55:36 2010 -0800
tree 1be055e761a5265467e539f86d6e3135ed789778
parent 1aab83501cb2ddc264ec9913d1062b1c87344e3a

Fix bug 3146938 - Menus spawned by ActionBar should hide when action
bar is hidden

Any popup spawned by the private class MenuPopupHelper will be hidden
if its anchor becomes hidden. ("hidden" == !View#isShown())

Fix a bug where ActionBar subtitle views were not going away when
subtitle text was set to null.

Fix a bug when switching out of ActionBar tabbed nav mode with no
active tabs.

Change-Id: I1f30c067156221f96905ac69ab876418ad2e94f8

core/java/com/android/internal/app/ActionBarImpl.java

diff --git a/core/java/com/android/internal/app/ActionBarImpl.java b/core/java/com/android/internal/app/ActionBarImpl.java
index 7cf369f..cd1cae6 100644
--- a/core/java/com/android/internal/app/ActionBarImpl.java
+++ b/core/java/com/android/internal/app/ActionBarImpl.java
@@ -616,7 +616,7 @@
     public int getSelectedNavigationIndex() {
         switch (mActionView.getNavigationMode()) {
             case NAVIGATION_MODE_TABS:
-                return mSelectedTab.getPosition();
+                return mSelectedTab != null ? mSelectedTab.getPosition() : -1;
             case NAVIGATION_MODE_LIST:
                 return mActionView.getDropdownSelectedPosition();
             default: