commit e7e97e65524977ad361811b95e8ee4557841d36a
author Winson Chung <winsonc@google.com> Mon Dec 02 17:02:50 2013 -0800
committer Winson Chung <winsonc@google.com> Wed Dec 04 20:11:09 2013 +0000
tree d5b45b912768ac58f3c1a8efb2b2df1d6055d917
parent 531a5c324e20b354a674851fd4808c105a80af3a

Retain current AllApps page if we never leave Launcher. (Bug 11468582)

Change-Id: Id18b14f6fbb2598a8c1f4c714f79d1a4332a7868

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 12c087f..e2301ba 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1765,7 +1765,7 @@
             }
 
             // Reset the apps customize page
-            if (mAppsCustomizeTabHost != null) {
+            if (!alreadyOnHome && mAppsCustomizeTabHost != null) {
                 mAppsCustomizeTabHost.reset();
             }
 
@@ -2375,7 +2375,7 @@
      * @param v The view that was clicked.
      */
     public void onClickAllAppsButton(View v) {
-        showAllApps(true, AppsCustomizePagedView.ContentType.Applications, true);
+        showAllApps(true, AppsCustomizePagedView.ContentType.Applications, false);
     }
 
     public void onTouchDownAllAppsButton(View v) {