diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2016-07-04 08:58:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-04 08:58:59 +0000 |
| commit | 26cb63b4e25650d6fedd5f84f9b9cbbd28f0bd24 (patch) | |
| tree | 1c58b5598fe95de003174dba42d3fb48f3935450 | |
| parent | 2f73a9b0bb3866c86cff98c19b1ccea215466d31 (diff) | |
| parent | 7111a2681336d5ef509d2b99d184d13e1598dea6 (diff) | |
| download | android_packages_apps_Trebuchet-26cb63b4e25650d6fedd5f84f9b9cbbd28f0bd24.tar.gz android_packages_apps_Trebuchet-26cb63b4e25650d6fedd5f84f9b9cbbd28f0bd24.tar.bz2 android_packages_apps_Trebuchet-26cb63b4e25650d6fedd5f84f9b9cbbd28f0bd24.zip | |
Merge \"Remove relayouts b/29945805\" into ub-launcher3-calgary
am: 7111a26813
Change-Id: I0156d8f0b69609dda7be16add216f08e8e5056f7
| -rw-r--r-- | src/com/android/launcher3/Hotseat.java | 5 | ||||
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsTransitionController.java | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java index b2f24bec5..b75d2c0da 100644 --- a/src/com/android/launcher3/Hotseat.java +++ b/src/com/android/launcher3/Hotseat.java @@ -220,11 +220,10 @@ public class Hotseat extends FrameLayout } 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); } } diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java index 3ae8cd8fa..87236aa91 100644 --- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java +++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java @@ -444,5 +444,6 @@ public class AllAppsTransitionController implements TouchController, VerticalPul if (!mLauncher.isAllAppsVisible()) { setProgress(mShiftRange); } + mHotseat.removeOnLayoutChangeListener(this); } } |