commit 7111a2681336d5ef509d2b99d184d13e1598dea6
author Hyunyoung Song <hyunyoungs@google.com> Mon Jul 04 08:53:37 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 04 08:53:37 2016 +0000
tree 1c58b5598fe95de003174dba42d3fb48f3935450
parent d1e0cec51894ffe1971a687740c91814eb5c998f
parent 45eb757ea7321aeb8b34803681ec2eb4532b6d55

Merge "Remove relayouts b/29945805" into ub-launcher3-calgary

src/com/android/launcher3/Hotseat.java

diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index b2f24be..b75d2c0 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -220,11 +220,10 @@
     }
 
     public void setBackgroundTransparent(boolean enable) {
-        // This causes re-layout. Should replace the logic with simply setting the background alpha
         if (enable) {
-            setBackground(null);
+            mBackground.setAlpha(0);
         } else {
-            setBackground(mBackground);
+            mBackground.setAlpha(255);
         }
     }
 

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 3ae8cd8..87236aa 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -444,5 +444,6 @@
         if (!mLauncher.isAllAppsVisible()) {
             setProgress(mShiftRange);
         }
+        mHotseat.removeOnLayoutChangeListener(this);
     }
 }