diff --git a/src/com/android/launcher3/views/AbstractSlideInView.java b/src/com/android/launcher3/views/AbstractSlideInView.java index 30e09718c2..d87d7c0935 100644 --- a/src/com/android/launcher3/views/AbstractSlideInView.java +++ b/src/com/android/launcher3/views/AbstractSlideInView.java @@ -300,12 +300,6 @@ public abstract class AbstractSlideInView invalidate(); } - @Override - public void onBackInvoked() { - super.onBackInvoked(); - animateSlideInViewToNoScale(); - } - @Override public void onBackCancelled() { super.onBackCancelled(); diff --git a/src/com/android/launcher3/views/WidgetsEduView.java b/src/com/android/launcher3/views/WidgetsEduView.java index 40c611591c..45ff9de503 100644 --- a/src/com/android/launcher3/views/WidgetsEduView.java +++ b/src/com/android/launcher3/views/WidgetsEduView.java @@ -59,6 +59,7 @@ public class WidgetsEduView extends AbstractSlideInView implements mContent = findViewById(R.id.edu_view); findViewById(R.id.edu_close_button) .setOnClickListener(v -> close(/* animate= */ true)); + setContentBackgroundWithParent(mContent.getBackground(), mContent); } @Override @@ -68,6 +69,12 @@ public class WidgetsEduView extends AbstractSlideInView implements mContent.getPaddingTop(), mContent.getPaddingEnd(), insets.bottom); } + @Override + protected void onScaleProgressChanged() { + super.onScaleProgressChanged(); + setTranslationY(getMeasuredHeight() * (1 - mSlideInViewScale.value) / 2); + } + private void show() { attachToContainer(); animateOpen();