Merge branch 'master' of github.com:jamesmontemagno/MonoDroid.ActionBar

Conflicts: MonoDroid.ActionBar.suo MonoDroid.ActionBar/ActionBar/ActionBar.cs
AshD · Jul 10, 2012 · 74cad53 · 74cad53
2 parents a25cda5 + 9e41cdb
commit 74cad53
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/MonoDroid.ActionBar/ActionBar/ActionBar.cs b/MonoDroid.ActionBar/ActionBar/ActionBar.cs
@@ -278,7 +278,7 @@ public void AddAction(ActionBarAction action, int index)
             var addActionBar = false;
 
             var hideAction = false;
-            if (!ActionBarUtils.ActionFits(CurrentActivity, index + 1, m_HasMenuButton, action.ActionType))
+            if (!ActionBarUtils.ActionFits(CurrentActivity, index, m_HasMenuButton, action.ActionType))
             {
                 if(!m_HasMenuButton)
                 {
@@ -312,6 +312,7 @@ public void AddAction(ActionBarAction action, int index)
         public void RemoveAllActions()
         {
             m_ActionsView.RemoveAllViews();
+            m_OverflowAction.ClearActions();
             MenuItemsToHide.Clear();
         }
 

diff --git a/MonoDroid.ActionBar/ActionBar/OverflowActionBarAction.cs b/MonoDroid.ActionBar/ActionBar/OverflowActionBarAction.cs
@@ -52,6 +52,13 @@ public Spinner OverflowSpinner
             }
         }
 
+        public void ClearActions()
+        {
+            ActionList.Clear();
+            m_StringIds.Clear();
+            m_StringIds.Add(string.Empty);//add back in first one cause we have to.
+        }
+
         public override int GetDrawable()
         {
             return mDrawable;

diff --git a/MonoDroid.ActionBar/ActionBarBase/ActionBarActivity.cs b/MonoDroid.ActionBar/ActionBarBase/ActionBarActivity.cs
@@ -44,6 +44,9 @@ public override bool OnPrepareOptionsMenu(IMenu menu)
             if(ActionBar == null)
                 return base.OnPrepareOptionsMenu(menu);
 
+            menu.Clear();
+            MenuInflater.Inflate(IsDarkTheme ? DarkMenuId : MenuId, menu);
+
             for (int i = 0; i < menu.Size(); i++)
             {
                 var menuItem = menu.GetItem(i);

diff --git a/MonoDroid.ActionBar/ActionBarBase/ActionBarListActivity.cs b/MonoDroid.ActionBar/ActionBarBase/ActionBarListActivity.cs
@@ -44,6 +44,9 @@ public override bool OnPrepareOptionsMenu(IMenu menu)
             if (ActionBar == null)
                 return base.OnPrepareOptionsMenu(menu);
 
+            menu.Clear();
+            MenuInflater.Inflate(IsDarkTheme ? DarkMenuId : MenuId, menu);
+
             for (int i = 0; i < menu.Size(); i++)
             {
                 var menuItem = menu.GetItem(i);