diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2016-07-04 08:53:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-07-04 08:53:37 +0000 |
| commit | 7111a2681336d5ef509d2b99d184d13e1598dea6 (patch) | |
| tree | 1c58b5598fe95de003174dba42d3fb48f3935450 /src/com/android | |
| parent | d1e0cec51894ffe1971a687740c91814eb5c998f (diff) | |
| parent | 45eb757ea7321aeb8b34803681ec2eb4532b6d55 (diff) | |
| download | android_packages_apps_Trebuchet-7111a2681336d5ef509d2b99d184d13e1598dea6.tar.gz android_packages_apps_Trebuchet-7111a2681336d5ef509d2b99d184d13e1598dea6.tar.bz2 android_packages_apps_Trebuchet-7111a2681336d5ef509d2b99d184d13e1598dea6.zip | |
Merge "Remove relayouts b/29945805" into ub-launcher3-calgary
Diffstat (limited to 'src/com/android')
| -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); } } |