commit 727f1222e681a91ac96a41c7ac92da4e92bf8e54
author Makoto Onuki <omakoto@google.com> Wed Jul 20 11:33:31 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 20 11:33:31 2011 -0700
tree 38c6dc19e025039c42e20e662a1082ade25132f8
parent 3f0d20aa18e63f9af389216a0265ea4e5e4065cf
parent 41164239bf48685394b1aff7b807ea8983feda81

Merge "(1-pane) Do smooth transition when switching between tabs"

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

diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 7040bdc..07fa8f1 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -582,10 +582,12 @@
             if (mActionBarAdapter.isSearchMode()) {
                 mTabPagerAdapter.setSearchMode(true);
             } else {
+                // No smooth scrolling if quitting from the search mode.
+                final boolean wasSearchMode = mTabPagerAdapter.isSearchMode();
                 mTabPagerAdapter.setSearchMode(false);
                 int tabIndex = tab.ordinal();
                 if (mTabPager.getCurrentItem() != tabIndex) {
-                    mTabPager.setCurrentItem(tab.ordinal(), false /* no smooth scroll */);
+                    mTabPager.setCurrentItem(tabIndex, !wasSearchMode);
                 }
             }
             invalidateOptionsMenu();