summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/LauncherStateTransitionAnimation.java
diff options
context:
space:
mode:
authorHyunyoung Song <hyunyoungs@google.com>2016-07-12 11:14:41 -0700
committerHyunyoung Song <hyunyoungs@google.com>2016-07-12 15:37:15 -0700
commitca7f30f7cfdbea155cbef701485718fa5dd86f46 (patch)
treeddfe325ca83937787c5cc814e39baebbd790894c /src/com/android/launcher3/LauncherStateTransitionAnimation.java
parent7ed42af3398c1764424ebbf2dd6e2a51e05eaf5f (diff)
downloadandroid_packages_apps_Trebuchet-ca7f30f7cfdbea155cbef701485718fa5dd86f46.tar.gz
android_packages_apps_Trebuchet-ca7f30f7cfdbea155cbef701485718fa5dd86f46.tar.bz2
android_packages_apps_Trebuchet-ca7f30f7cfdbea155cbef701485718fa5dd86f46.zip
Fix all apps becoming clipped when screen is rotated with all apps opened.
b/30040068 Change-Id: I5e89a82310fddd5aa89a8f5d855b2efa526f8244
Diffstat (limited to 'src/com/android/launcher3/LauncherStateTransitionAnimation.java')
-rw-r--r--src/com/android/launcher3/LauncherStateTransitionAnimation.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/launcher3/LauncherStateTransitionAnimation.java b/src/com/android/launcher3/LauncherStateTransitionAnimation.java
index e94153d68..6843d6096 100644
--- a/src/com/android/launcher3/LauncherStateTransitionAnimation.java
+++ b/src/com/android/launcher3/LauncherStateTransitionAnimation.java
@@ -252,7 +252,10 @@ public class LauncherStateTransitionAnimation {
playCommonTransitionAnimations(toWorkspaceState, fromView, toView,
animated, initialized, animation, revealDuration, layerViews);
if (!animated || !initialized) {
-
+ if (FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP &&
+ toWorkspaceState == Workspace.State.NORMAL_HIDDEN) {
+ mAllAppsController.finishPullUp();
+ }
toView.setTranslationX(0.0f);
toView.setTranslationY(0.0f);
toView.setScaleX(1.0f);
@@ -672,7 +675,8 @@ public class LauncherStateTransitionAnimation {
playCommonTransitionAnimations(toWorkspaceState, fromView, toView,
animated, initialized, animation, revealDuration, layerViews);
if (!animated || !initialized) {
- if (FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP) {
+ if (FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP &&
+ fromWorkspaceState == Workspace.State.NORMAL_HIDDEN) {
mAllAppsController.finishPullDown();
}
fromView.setVisibility(View.GONE);