commit a6aab437dcc813dc69274a8b1d16e4a5746d0eff
author Hyunyoung Song <hyunyoungs@google.com> Fri Aug 05 18:56:31 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Aug 05 18:56:31 2016 +0000
tree db436404b5ec68b7de39a21f262959fa0554d090
parent e290505aa0ace7237b05638ca24198f66de6a7ba
parent d7d740287f104c0597f01b66399c7e65a9b57dab

Fix hotseat flicker when opened all apps in landscape, rotate screen, pull down
am: d7d740287f

Change-Id: Ie5f36dee1fd63fc4f5e92c790ae7fff80f8730c3

src/com/android/launcher3/LauncherStateTransitionAnimation.java

diff --git a/src/com/android/launcher3/LauncherStateTransitionAnimation.java b/src/com/android/launcher3/LauncherStateTransitionAnimation.java
index 2b1ebde..eb70650 100644
--- a/src/com/android/launcher3/LauncherStateTransitionAnimation.java
+++ b/src/com/android/launcher3/LauncherStateTransitionAnimation.java
@@ -265,7 +265,6 @@
             toView.setScaleY(1.0f);
             toView.setAlpha(1.0f);
             toView.setVisibility(View.VISIBLE);
-            toView.bringToFront();
 
             // Show the content view
             contentView.setVisibility(View.VISIBLE);

src/com/android/launcher3/allapps/AllAppsTransitionController.java

diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index b0a62e1..98dd612 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -262,10 +262,10 @@
             // 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);
             }