commit 41164239bf48685394b1aff7b807ea8983feda81
author Makoto Onuki <omakoto@google.com> Wed Jul 20 11:18:44 2011 -0700
committer Makoto Onuki <omakoto@google.com> Wed Jul 20 11:18:44 2011 -0700
tree d5cd8cf534b3ed5cb736282639a9e0e38910f913
parent 74427c1c84eb36dd9856a2ef4ba62517a3081fac

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

Bug 5044832

Change-Id: I574549ac5a55a45008f0c3d77dfe0225cdccef73

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 0b403cb..95e7072 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -575,10 +575,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();