commit 01d3697a814fc1edcb1783c2f0f5b38dbbbe9879
author Isaac Katzenelson <isaack@android.com> Wed Jun 29 11:29:35 2011 -0700
committer Isaac Katzenelson <isaack@android.com> Wed Jun 29 17:33:25 2011 -0700
tree 61fe8210f8348fcfadfcf96a1b0594922a956462
parent 79875d5315830fec8ddf11da5bf121a968db02a0

Fix issues with view not switching using the pull-down menu

Change-Id: I63495f6f48ec5fbac44d303f338399403ca7930e

src/com/android/calendar/AllInOneActivity.java

diff --git a/src/com/android/calendar/AllInOneActivity.java b/src/com/android/calendar/AllInOneActivity.java
index 371f6cc..cbe30d2 100644
--- a/src/com/android/calendar/AllInOneActivity.java
+++ b/src/com/android/calendar/AllInOneActivity.java
@@ -695,24 +695,36 @@
                 if (mActionBar != null && (mActionBar.getSelectedTab() != mAgendaTab)) {
                     mActionBar.selectTab(mAgendaTab);
                 }
+                if (mActionBarMenuSpinnerAdapter != null) {
+                    mActionBar.setSelectedNavigationItem(CalendarViewAdapter.AGENDA_BUTTON_INDEX);
+                }
                 frag = new AgendaFragment(timeMillis, false);
                 break;
             case ViewType.DAY:
                 if (mActionBar != null && (mActionBar.getSelectedTab() != mDayTab)) {
                     mActionBar.selectTab(mDayTab);
                 }
+                if (mActionBarMenuSpinnerAdapter != null) {
+                    mActionBar.setSelectedNavigationItem(CalendarViewAdapter.DAY_BUTTON_INDEX);
+                }
                 frag = new DayFragment(timeMillis, 1);
                 break;
             case ViewType.WEEK:
                 if (mActionBar != null && (mActionBar.getSelectedTab() != mWeekTab)) {
                     mActionBar.selectTab(mWeekTab);
                 }
+                if (mActionBarMenuSpinnerAdapter != null) {
+                    mActionBar.setSelectedNavigationItem(CalendarViewAdapter.WEEK_BUTTON_INDEX);
+                }
                 frag = new DayFragment(timeMillis, 7);
                 break;
             case ViewType.MONTH:
                 if (mActionBar != null && (mActionBar.getSelectedTab() != mMonthTab)) {
                     mActionBar.selectTab(mMonthTab);
                 }
+                if (mActionBarMenuSpinnerAdapter != null) {
+                    mActionBar.setSelectedNavigationItem(CalendarViewAdapter.MONTH_BUTTON_INDEX);
+                }
                 frag = new MonthByWeekFragment(timeMillis, false);
                 if (mShowAgendaWithMonth) {
                     secFrag = new AgendaFragment(timeMillis, false);