diff options
| author | Winson Chung <winsonc@google.com> | 2013-12-02 17:02:50 -0800 |
|---|---|---|
| committer | Danesh M <daneshm90@gmail.com> | 2014-06-06 22:54:21 -0700 |
| commit | 72180f8f9194524fb740e0af34dc7f62540fbb7b (patch) | |
| tree | bb97d10f0d8da1efbc965227282cb0c8eeeebbf3 /src | |
| parent | 7b166877a4d5b6058047e4df517ddfa7cd4dc9f5 (diff) | |
| download | android_packages_apps_Trebuchet-72180f8f9194524fb740e0af34dc7f62540fbb7b.tar.gz android_packages_apps_Trebuchet-72180f8f9194524fb740e0af34dc7f62540fbb7b.tar.bz2 android_packages_apps_Trebuchet-72180f8f9194524fb740e0af34dc7f62540fbb7b.zip | |
Retain current AllApps page if we never leave Launcher. (Bug 11468582)
Change-Id: Id18b14f6fbb2598a8c1f4c714f79d1a4332a7868
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 1ad1e2bc4..9b5a0c3ea 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1942,7 +1942,7 @@ public class Launcher extends Activity } // Reset the apps customize page - if (mAppsCustomizeLayout != null) { + if (!alreadyOnHome && mAppsCustomizeLayout != null) { mAppsCustomizeLayout.reset(); } @@ -2579,7 +2579,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) { |