commit 35aa14d5e33e4f5cccb9fd23be1047f26d67b409
author Michael Jurka <mikejurka@google.com> Thu Jul 07 17:01:08 2011 -0700
committer Michael Jurka <mikejurka@google.com> Thu Jul 07 17:01:08 2011 -0700
tree ce034d3bae13ad7e341b71e64f567a0f7f65eede
parent eb99f1648c63ad35e1a528e566aa47df581864f8

Don't reset pages in AllApps if not necessary

src/com/android/launcher2/AppsCustomizePagedView.java

diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java
index 888d3d3..90f2815 100644
--- a/src/com/android/launcher2/AppsCustomizePagedView.java
+++ b/src/com/android/launcher2/AppsCustomizePagedView.java
@@ -1137,6 +1137,7 @@
         addAppsWithoutInvalidate(list);
         invalidatePageData();
     }
+
     @Override
     public void reset() {
         if (mContentType != ContentType.Applications) {
@@ -1144,7 +1145,7 @@
             AppsCustomizeTabHost tabs = (AppsCustomizeTabHost)
                     mLauncher.findViewById(R.id.apps_customize_pane);
             tabs.setCurrentTabByTag(tabs.getTabTagForContentType(ContentType.Applications));
-        } else {
+        } else if (getCurrentPage() != 0) {
             setCurrentPage(0);
             invalidatePageData();
         }

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 5c9e4dd..6f64f9d 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1284,7 +1284,7 @@
                 imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
             }
 
-            // Reset AllApps to it's initial state
+            // Reset AllApps to its initial state
             if (mAppsCustomizeContent != null) {
                 mAppsCustomizeContent.reset();
             }