summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/Launcher.java
diff options
context:
space:
mode:
authorPatrick Dubroy <dubroy@google.com>2011-02-24 11:42:23 -0800
committerPatrick Dubroy <dubroy@google.com>2011-02-24 11:43:59 -0800
commita0aa0121b91fde17e427ab2763ce312e64cf5d33 (patch)
tree91c1d36b3340eee3ab12f9ed05e76fca8e4cf7a2 /src/com/android/launcher2/Launcher.java
parent62ae29f8b50f59093d30c30a737eac956352c396 (diff)
downloadandroid_packages_apps_Trebuchet-a0aa0121b91fde17e427ab2763ce312e64cf5d33.tar.gz
android_packages_apps_Trebuchet-a0aa0121b91fde17e427ab2763ce312e64cf5d33.tar.bz2
android_packages_apps_Trebuchet-a0aa0121b91fde17e427ab2763ce312e64cf5d33.zip
Fix issue with some home button presses being ignored.
We are ignoring home button presses after panning away from the default screen, when the workspace is still moving slightly. Also, make the home button a no-op when the user is in the middle of panning the screen (i.e. finger is still down). Change-Id: Ida6bad4faaf90b6802aac2cbf3444f76b7b38100
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
-rw-r--r--src/com/android/launcher2/Launcher.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 792047287..59f142a41 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1449,7 +1449,7 @@ public final class Launcher extends Activity
mWorkspace.unshrink(alreadyOnHome);
}
- if (alreadyOnHome && mState == State.WORKSPACE && !mWorkspace.isDefaultPageShowing()) {
+ if (alreadyOnHome && mState == State.WORKSPACE && !mWorkspace.isTouchActive()) {
mWorkspace.moveToDefaultScreen(true);
}
showWorkspace(alreadyOnHome);