diff options
| author | Jorge Ruesga <jorge@ruesga.com> | 2014-03-09 21:58:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2014-03-09 21:58:02 +0000 |
| commit | ec30873b0571d25780032e29d4a9910e70f49721 (patch) | |
| tree | ac6575459a2abf5715b3362ca7cc5dd950926110 | |
| parent | 99a7b0f03ce98a21c6dc44e7606643b99c2910d7 (diff) | |
| parent | 680401898880b5deb2dd902d540967bb45afec96 (diff) | |
| download | android_packages_apps_Trebuchet-ec30873b0571d25780032e29d4a9910e70f49721.tar.gz android_packages_apps_Trebuchet-ec30873b0571d25780032e29d4a9910e70f49721.tar.bz2 android_packages_apps_Trebuchet-ec30873b0571d25780032e29d4a9910e70f49721.zip | |
Merge "trebuchet: fix custom home transition effect" into cm-11.0
| -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; |