From d7d740287f104c0597f01b66399c7e65a9b57dab Mon Sep 17 00:00:00 2001 From: Hyunyoung Song Date: Thu, 4 Aug 2016 15:48:42 -0700 Subject: [PATCH] Fix hotseat flicker when opened all apps in landscape, rotate screen, pull down b/30595452 Change-Id: Ib634ffbc509c6b16ac58c184ccbca15ae936be14 --- .../android/launcher3/LauncherStateTransitionAnimation.java | 1 - .../launcher3/allapps/AllAppsTransitionController.java | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/com/android/launcher3/LauncherStateTransitionAnimation.java b/src/com/android/launcher3/LauncherStateTransitionAnimation.java index b6e2e4c2e9..06ffeece9c 100644 --- a/src/com/android/launcher3/LauncherStateTransitionAnimation.java +++ b/src/com/android/launcher3/LauncherStateTransitionAnimation.java @@ -265,7 +265,6 @@ public class LauncherStateTransitionAnimation { toView.setScaleY(1.0f); toView.setAlpha(1.0f); toView.setVisibility(View.VISIBLE); - toView.bringToFront(); // Show the content view contentView.setVisibility(View.VISIBLE); diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java index eb6c92628c..d8587ae347 100644 --- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java +++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java @@ -271,10 +271,10 @@ public class AllAppsTransitionController implements TouchController, VerticalPul // Initialize values that should not change until #onDragEnd mStatusBarHeight = mLauncher.getDragLayer().getInsets().top; mHotseat.setVisibility(View.VISIBLE); + mHotseatBackgroundColor = mHotseat.getBackgroundDrawableColor(); + mHotseat.setBackgroundTransparent(true /* transparent */); if (!mLauncher.isAllAppsVisible()) { mLauncher.tryAndUpdatePredictedApps(); - mHotseatBackgroundColor = mHotseat.getBackgroundDrawableColor(); - mHotseat.setBackgroundTransparent(true /* transparent */); mAppsView.setVisibility(View.VISIBLE); mAppsView.setRevealDrawableColor(mHotseatBackgroundColor); }