commit 40474a816f1a40f2c601d6cb72ab29b5309cdf32
author Daisuke Miyakawa <dmiyakawa@google.com> Mon Oct 25 17:07:34 2010 -0700
committer Daisuke Miyakawa <dmiyakawa@google.com> Tue Oct 26 13:07:20 2010 -0700
tree ce0c69ad5831f014e44eb215afd12750b0365ea4
parent 2ad374e21ae61b32e81f26dd448cf78a228fa8bb

Let AllInOneActivity call selectTab() manually

Bug: 3130258
Change-Id: Id8d326034ef6a634e6d2aa2b8528cac0066b4865

src/com/android/calendar/AllInOneActivity.java

diff --git a/src/com/android/calendar/AllInOneActivity.java b/src/com/android/calendar/AllInOneActivity.java
index dd40a9d..c3ea04f 100644
--- a/src/com/android/calendar/AllInOneActivity.java
+++ b/src/com/android/calendar/AllInOneActivity.java
@@ -383,12 +383,21 @@
                 frag = new AgendaFragment(timeMillis);
                 break;
             case ViewType.DAY:
+                if (mActionBar != null && (mActionBar.getSelectedTab() != mDayTab)) {
+                    mActionBar.selectTab(mDayTab);
+                }
                 frag = new DayFragment(timeMillis, 1);
                 break;
             case ViewType.WEEK:
+                if (mActionBar != null && (mActionBar.getSelectedTab() != mWeekTab)) {
+                    mActionBar.selectTab(mWeekTab);
+                }
                 frag = new DayFragment(timeMillis, 7);
                 break;
             case ViewType.MONTH:
+                if (mActionBar != null && (mActionBar.getSelectedTab() != mMonthTab)) {
+                    mActionBar.selectTab(mMonthTab);
+                }
                 frag = new MonthFragment(false, timeMillis, false);
                 break;
             case ViewType.EDIT:
@@ -553,11 +562,11 @@
 
     @Override
     public void onTabSelected(Tab tab, FragmentTransaction ft) {
-        if (tab == mDayTab) {
+        if (tab == mDayTab && mCurrentView != ViewType.DAY) {
             mController.sendEvent(this, EventType.GO_TO, null, null, -1, ViewType.DAY);
-        } else if (tab == mWeekTab) {
+        } else if (tab == mWeekTab && mCurrentView != ViewType.WEEK) {
             mController.sendEvent(this, EventType.GO_TO, null, null, -1, ViewType.WEEK);
-        } else if (tab == mMonthTab) {
+        } else if (tab == mMonthTab && mCurrentView != ViewType.MONTH) {
             mController.sendEvent(this, EventType.GO_TO, null, null, -1, ViewType.MONTH);
         } else {
             Log.w(TAG, "TabSelected event from unknown tab: " + tab);