diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2016-06-30 11:53:44 -0700 |
|---|---|---|
| committer | Hyunyoung Song <hyunyoungs@google.com> | 2016-06-30 15:30:53 -0700 |
| commit | a97c64bf9f57827eea8f680fff834b1140571a54 (patch) | |
| tree | fa51208e0a94c98d0d96057f2412f556b7c3d1e9 /src/com/android/launcher3/WorkspaceStateTransitionAnimation.java | |
| parent | 798f95552b9da671c2923bf960ecbe162a49213b (diff) | |
| download | android_packages_apps_Trebuchet-a97c64bf9f57827eea8f680fff834b1140571a54.tar.gz android_packages_apps_Trebuchet-a97c64bf9f57827eea8f680fff834b1140571a54.tar.bz2 android_packages_apps_Trebuchet-a97c64bf9f57827eea8f680fff834b1140571a54.zip | |
Fix hotseat flicker
b/29648104
Change-Id: I74eea09ab5c4d03c0df3b4a82c7636299edf4d32
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 ab4cd8da7..2fcd73d55 100644 --- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java +++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java @@ -273,7 +273,8 @@ public class WorkspaceStateTransitionAnimation { // Update the workspace state float finalBackgroundAlpha = (states.stateIsSpringLoaded || states.stateIsOverview) ? 1.0f : 0f; - float finalHotseatAlpha = (states.stateIsNormal || states.stateIsSpringLoaded) ? 1f : 0f; + float finalHotseatAlpha = (states.stateIsNormal || states.stateIsSpringLoaded || + (FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP && states.stateIsNormalHidden)) ? 1f : 0f; float finalOverviewPanelAlpha = states.stateIsOverview ? 1f : 0f; float finalWorkspaceTranslationY = 0; |