diff options
| author | Winson Chung <winsonc@google.com> | 2011-03-30 15:37:10 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-30 15:37:10 -0700 |
| commit | 3f272c6665090a006859892f441b058deb3d6fab (patch) | |
| tree | e464556ec7426b186df24c478199a2a829d3d225 /src/com/android/launcher2/Launcher.java | |
| parent | b9e2749d3d3379622dbbe38bd6c60f88f7fa827b (diff) | |
| parent | 337cd9d3f6b2abfe7e70a8e20f0017d67e9535ff (diff) | |
| download | android_packages_apps_Trebuchet-3f272c6665090a006859892f441b058deb3d6fab.tar.gz android_packages_apps_Trebuchet-3f272c6665090a006859892f441b058deb3d6fab.tar.bz2 android_packages_apps_Trebuchet-3f272c6665090a006859892f441b058deb3d6fab.zip | |
Merge "Resetting AllApps to first page when turning screen off/hitting home."
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index fc17643b1..a68bd9b74 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -1253,6 +1253,11 @@ public final class Launcher extends Activity if (Intent.ACTION_SCREEN_OFF.equals(action)) { mUserPresent = false; updateRunning(); + + // Reset AllApps to it's initial state + if (mAllAppsGrid != null) { + mAllAppsGrid.reset(); + } } else if (Intent.ACTION_USER_PRESENT.equals(action)) { mUserPresent = true; updateRunning(); @@ -1424,6 +1429,11 @@ public final class Launcher extends Activity INPUT_METHOD_SERVICE); imm.hideSoftInputFromWindow(v.getWindowToken(), 0); } + + // Reset AllApps to it's initial state + if (mAllAppsGrid != null) { + mAllAppsGrid.reset(); + } } } |