commit 68ca6aa964ae356354615a3bbc19ea99b4597a4b
author Daisuke Miyakawa <dmiyakawa@google.com> Thu Aug 18 09:08:08 2011 -0700
committer Daisuke Miyakawa <dmiyakawa@google.com> Thu Aug 18 13:36:09 2011 -0700
tree bdec7ceddb9ec1601d2c755e36a5e4eb3bc9b8d1
parent 32dc8e1cbc17636d98daf30c37a057fd351546f4

Hide unnecessary menus when launched via DIAL intent

ViewPager#getCurrentItem() returns "tabIndex" after
ViewPager#setCurrentItem(tabIndex, false), so we need to preserve
the previous value.

TESTED (using phone devices with/without a hard menu key)
- swipe actions do not corrupt menus
- tab clicks do not corrupt menus
- DIAL intent corretly shows/hides menus
- Menus aren't corrupted in Dialpad Chooser

Bug: 5118757
Change-Id: Id857a2d7ac5a007db65b20f80270a07ea527ba7f

src/com/android/contacts/activities/DialtactsActivity.java

diff --git a/src/com/android/contacts/activities/DialtactsActivity.java b/src/com/android/contacts/activities/DialtactsActivity.java
index b6dfbfa..12709c8 100644
--- a/src/com/android/contacts/activities/DialtactsActivity.java
+++ b/src/com/android/contacts/activities/DialtactsActivity.java
@@ -568,13 +568,14 @@
         } else {
             tabIndex = mLastManuallySelectedFragment;
         }
+
+        final int previousItemIndex = mViewPager.getCurrentItem();
         mViewPager.setCurrentItem(tabIndex, false /* smoothScroll */);
-        if (mViewPager.getCurrentItem() == tabIndex) {
-            mPageChangeListener.setCurrentPosition(tabIndex);
-            sendFragmentVisibilityChange(tabIndex, true);
-        } else {
-            getActionBar().selectTab(getActionBar().getTabAt(tabIndex));
+        if (previousItemIndex != tabIndex) {
+            sendFragmentVisibilityChange(previousItemIndex, false);
         }
+        mPageChangeListener.setCurrentPosition(tabIndex);
+        sendFragmentVisibilityChange(tabIndex, true);
 
         // Restore to the previous manual selection
         mLastManuallySelectedFragment = savedTabIndex;