commit 4f1a2db34498ba6addb0d0307bbd33ab25ddcee1
author Winson Chung <winsonc@google.com> Wed Jan 11 12:04:42 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 11 12:04:42 2012 -0800
tree 940c9d3e5c0280f878ae62101a171c3512d97e1b
parent 21d9b58734a26a02b85c232477bd21bf13332694
parent 649668f7af9ef730466082f935831c901cafc74a

Merge "Fixing issue where we may continue to restore the wrong page after resetting."

src/com/android/launcher2/AppsCustomizePagedView.java

diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java
index 7f0edde..94b92d1 100644
--- a/src/com/android/launcher2/AppsCustomizePagedView.java
+++ b/src/com/android/launcher2/AppsCustomizePagedView.java
@@ -1490,6 +1490,9 @@
 
     @Override
     public void reset() {
+        // If we have reset, then we should not continue to restore the previous state
+        mSaveInstanceStateItemIndex = -1;
+
         AppsCustomizeTabHost tabHost = getTabHost();
         String tag = tabHost.getCurrentTabTag();
         if (tag != null) {
@@ -1497,6 +1500,7 @@
                 tabHost.setCurrentTabFromContent(ContentType.Applications);
             }
         }
+
         if (mCurrentPage != 0) {
             invalidatePageData(0);
         }