summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2012-01-11 12:04:42 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-01-11 12:04:42 -0800
commit4f1a2db34498ba6addb0d0307bbd33ab25ddcee1 (patch)
tree940c9d3e5c0280f878ae62101a171c3512d97e1b /src
parent21d9b58734a26a02b85c232477bd21bf13332694 (diff)
parent649668f7af9ef730466082f935831c901cafc74a (diff)
downloadandroid_packages_apps_Trebuchet-4f1a2db34498ba6addb0d0307bbd33ab25ddcee1.tar.gz
android_packages_apps_Trebuchet-4f1a2db34498ba6addb0d0307bbd33ab25ddcee1.tar.bz2
android_packages_apps_Trebuchet-4f1a2db34498ba6addb0d0307bbd33ab25ddcee1.zip
Merge "Fixing issue where we may continue to restore the wrong page after resetting."
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/AppsCustomizePagedView.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java
index 7f0edde75..94b92d197 100644
--- a/src/com/android/launcher2/AppsCustomizePagedView.java
+++ b/src/com/android/launcher2/AppsCustomizePagedView.java
@@ -1490,6 +1490,9 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
@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 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
tabHost.setCurrentTabFromContent(ContentType.Applications);
}
}
+
if (mCurrentPage != 0) {
invalidatePageData(0);
}