diff options
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher2/Workspace.java | 4 |
2 files changed, 3 insertions, 3 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); diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index fe54ae7b6..394614fac 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -419,8 +419,8 @@ public class Workspace extends SmoothPagedView return folders; } - boolean isDefaultPageShowing() { - return mCurrentPage == mDefaultPage; + boolean isTouchActive() { + return mTouchState != TOUCH_STATE_REST; } /** |