summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2013-12-02 17:02:50 -0800
committerWinson Chung <winsonc@google.com>2013-12-04 20:11:09 +0000
commite7e97e65524977ad361811b95e8ee4557841d36a (patch)
treed5b45b912768ac58f3c1a8efb2b2df1d6055d917
parent531a5c324e20b354a674851fd4808c105a80af3a (diff)
downloadandroid_packages_apps_Trebuchet-e7e97e65524977ad361811b95e8ee4557841d36a.tar.gz
android_packages_apps_Trebuchet-e7e97e65524977ad361811b95e8ee4557841d36a.tar.bz2
android_packages_apps_Trebuchet-e7e97e65524977ad361811b95e8ee4557841d36a.zip
Retain current AllApps page if we never leave Launcher. (Bug 11468582)
Change-Id: Id18b14f6fbb2598a8c1f4c714f79d1a4332a7868
-rw-r--r--src/com/android/launcher3/Launcher.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 12c087f27..e2301ba69 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1765,7 +1765,7 @@ public class Launcher extends Activity
}
// Reset the apps customize page
- if (mAppsCustomizeTabHost != null) {
+ if (!alreadyOnHome && mAppsCustomizeTabHost != null) {
mAppsCustomizeTabHost.reset();
}
@@ -2375,7 +2375,7 @@ public class Launcher extends Activity
* @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) {