diff options
| author | Winson Chung <winsonc@google.com> | 2013-12-04 21:42:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-12-04 21:42:55 +0000 |
| commit | 17bde09a9e9bc4113d9763ccf827307509c04aef (patch) | |
| tree | 7111ebbc2bb8f312703179327c9b5e3b423be95e /src | |
| parent | 42b3c06849331aa5ba1f07f8c58915190d386aac (diff) | |
| parent | e7e97e65524977ad361811b95e8ee4557841d36a (diff) | |
| download | android_packages_apps_Trebuchet-17bde09a9e9bc4113d9763ccf827307509c04aef.tar.gz android_packages_apps_Trebuchet-17bde09a9e9bc4113d9763ccf827307509c04aef.tar.bz2 android_packages_apps_Trebuchet-17bde09a9e9bc4113d9763ccf827307509c04aef.zip | |
Merge "Retain current AllApps page if we never leave Launcher. (Bug 11468582)" into jb-ub-now-kermit
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 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) { |