Merge changes from topic "am-85c4a06c-b495-4e8b-9fa0-1fa07db12132" into ub-launcher3-master
* changes:
[automerger] Bound overscroll shift amount to avoid content from drawing on top (Y-val) of the QSB. am: 5916709219
Bound overscroll shift amount to avoid content from drawing on top (Y-val) of the QSB.
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 2c08169..af4faa8 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -318,7 +318,7 @@
if (!internalStateHandled) {
// If we are not binding synchronously, show a fade in animation when
// the first page bind completes.
- mDragLayer.setAlpha(0);
+ mLauncherView.setAlpha(0);
}
} else {
// Pages bound synchronously.
@@ -2131,8 +2131,8 @@
@Override
public void finishFirstPageBind(final ViewOnDrawExecutor executor) {
- if (mDragLayer.getAlpha() < 1) {
- mDragLayer.animate().alpha(1).withEndAction(
+ if (mLauncherView.getAlpha() < 1) {
+ mLauncherView.animate().alpha(1).withEndAction(
executor == null ? null : executor::onLoadAnimationCompleted).start();
} else if (executor != null) {
executor.onLoadAnimationCompleted();