diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-06-21 17:46:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-21 17:46:56 +0000 |
| commit | 713afa70e5c836c93c79f78dc9a36b1847f7d541 (patch) | |
| tree | 6ee595868ef4212f2fc6c51a1cf12616803a9d3d /src/com/android/launcher3/allapps/AllAppsTransitionController.java | |
| parent | e26d1008eb587303db25797ca02cc32464e45656 (diff) | |
| parent | bfa8fbd782370c9d1f5b24f94dc29b74a31b28f0 (diff) | |
| download | android_packages_apps_Trebuchet-713afa70e5c836c93c79f78dc9a36b1847f7d541.tar.gz android_packages_apps_Trebuchet-713afa70e5c836c93c79f78dc9a36b1847f7d541.tar.bz2 android_packages_apps_Trebuchet-713afa70e5c836c93c79f78dc9a36b1847f7d541.zip | |
Merge "Maintaining separate alpha for x and y translations" into ub-launcher3-calgary
Diffstat (limited to 'src/com/android/launcher3/allapps/AllAppsTransitionController.java')
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsTransitionController.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java index 4bdd9f4ee..f30e08e65 100644 --- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java +++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java @@ -18,6 +18,7 @@ import com.android.launcher3.Launcher; import com.android.launcher3.LauncherAnimUtils; import com.android.launcher3.PagedView; import com.android.launcher3.Workspace; +import com.android.launcher3.Workspace.Direction; import com.android.launcher3.util.TouchController; /** @@ -222,10 +223,10 @@ public class AllAppsTransitionController implements TouchController, VerticalPul mDecelInterpolator.getInterpolation(alpha)))); mAppsView.getContentView().setAlpha(alpha); mAppsView.setTranslationY(progress); - mWorkspace.setWorkspaceTranslation(View.TRANSLATION_Y, + mWorkspace.setWorkspaceTranslation(Direction.Y, PARALLAX_COEFFICIENT *(-mTranslation + progress), mAccelInterpolator.getInterpolation(workspaceHotseatAlpha)); - mWorkspace.setHotseatTranslation(View.TRANSLATION_Y, -mTranslation + progress, + mWorkspace.setHotseatTranslation(Direction.Y, -mTranslation + progress, mAccelInterpolator.getInterpolation(workspaceHotseatAlpha)); } |