diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2016-07-06 15:03:59 -0700 |
|---|---|---|
| committer | Hyunyoung Song <hyunyoungs@google.com> | 2016-07-06 15:03:59 -0700 |
| commit | 230b2b7f441cef5c842f0c6f13a0b91db043a94c (patch) | |
| tree | 4dec9cff9d1a1dc4107cff656fa0038706720287 /src/com/android/launcher3/allapps/AllAppsTransitionController.java | |
| parent | 8db7d68aaccb58a646d24080d3fa7e093900e11b (diff) | |
| download | android_packages_apps_Trebuchet-230b2b7f441cef5c842f0c6f13a0b91db043a94c.tar.gz android_packages_apps_Trebuchet-230b2b7f441cef5c842f0c6f13a0b91db043a94c.tar.bz2 android_packages_apps_Trebuchet-230b2b7f441cef5c842f0c6f13a0b91db043a94c.zip | |
Second workspace page icons should not show up when all apps is shown in landscape.
b/29931405
> Also some method names to setTranslation -> setTranslationAndAlpha to
match its implementation.
Change-Id: Icb6ec5df8a267a9024803c70a694ea9b76e5e34d
Diffstat (limited to 'src/com/android/launcher3/allapps/AllAppsTransitionController.java')
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsTransitionController.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java index 87236aa91..0babc1a80 100644 --- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java +++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java @@ -288,14 +288,14 @@ public class AllAppsTransitionController implements TouchController, VerticalPul mDecelInterpolator.getInterpolation(alpha)))); mAppsView.getContentView().setAlpha(alpha); mAppsView.setTranslationY(progress); - mWorkspace.setWorkspaceTranslation(Direction.Y, + mWorkspace.setWorkspaceTranslationAndAlpha(Direction.Y, PARALLAX_COEFFICIENT * (-mShiftRange + progress), mAccelInterpolator.getInterpolation(workspaceHotseatAlpha)); if (!mLauncher.getDeviceProfile().isVerticalBarLayout()) { - mWorkspace.setHotseatTranslation(Direction.Y, -mShiftRange + progress, + mWorkspace.setHotseatTranslationAndAlpha(Direction.Y, -mShiftRange + progress, mAccelInterpolator.getInterpolation(workspaceHotseatAlpha)); } else { - mWorkspace.setHotseatTranslation(Direction.Y, + mWorkspace.setHotseatTranslationAndAlpha(Direction.Y, PARALLAX_COEFFICIENT * (-mShiftRange + progress), mAccelInterpolator.getInterpolation(workspaceHotseatAlpha)); } |