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/WorkspaceStateTransitionAnimation.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/WorkspaceStateTransitionAnimation.java')
| -rw-r--r-- | src/com/android/launcher3/WorkspaceStateTransitionAnimation.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java index 2fcd73d55..a73f3ec37 100644 --- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java +++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java @@ -312,7 +312,8 @@ public class WorkspaceStateTransitionAnimation { if (states.stateIsOverviewHidden) { finalAlpha = 0f; } else if(states.stateIsNormalHidden) { - finalAlpha = FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP ? 1 : 0; + finalAlpha = (FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP && + i == mWorkspace.getNextPage()) ? 1 : 0; } else if (states.stateIsNormal && mWorkspaceFadeInAdjacentScreens) { finalAlpha = (i == toPage || i < customPageCount) ? 1f : 0f; } else { |