diff options
author | Jorge Ruesga <jorge@ruesga.com> | 2014-02-24 01:26:33 +0100 |
---|---|---|
committer | Jorge Ruesga <jorge@ruesga.com> | 2014-02-24 01:26:33 +0100 |
commit | 680401898880b5deb2dd902d540967bb45afec96 (patch) | |
tree | d5b23cfb544a33b91f2533e174e493a51616f21c | |
parent | 74631d6a5adce416a7fac49d71ad3657cfa6bf63 (diff) | |
download | android_packages_apps_Trebuchet-680401898880b5deb2dd902d540967bb45afec96.tar.gz android_packages_apps_Trebuchet-680401898880b5deb2dd902d540967bb45afec96.tar.bz2 android_packages_apps_Trebuchet-680401898880b5deb2dd902d540967bb45afec96.zip |
trebuchet: fix custom home transition effect
Change-Id: Ie9d24fd40a2c60834cd4e69564bbb59224b32cb9
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 99c8ec0ae..c99a0a51a 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -1539,8 +1539,8 @@ public class Workspace extends SmoothPagedView boolean isOnLastPageBeforeCustomContent = false; if (hasCustomContent()) { int customContentWidth = mWorkspaceScreens.get(CUSTOM_CONTENT_SCREEN_ID).getMeasuredWidth(); - isOnLastPageBeforeCustomContent = (mOverScrollX < customContentWidth && (!hasCustomContent() || isLayoutRtl())) || - (mOverScrollX > mMaxScrollX - customContentWidth && (!hasCustomContent() || !isLayoutRtl())); + isOnLastPageBeforeCustomContent = (mOverScrollX < customContentWidth && !isLayoutRtl()) || + ((mOverScrollX > mMaxScrollX - customContentWidth) && isLayoutRtl()); } mUseTransitionEffect = !isOnLastPageBeforeCustomContent && mState == State.NORMAL && !mIsSwitchingState; |