Merge "[Predictive Back] Fix widget edu back swipe" into main (78adef76) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/views/AbstractSlideInView.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -300,12 +300,6 @@ public abstract class AbstractSlideInView<T extends Context & ActivityContext>
		invalidate();
		}

		@Override
		public void onBackInvoked() {
		super.onBackInvoked();
		animateSlideInViewToNoScale();
		}

		@Override
		public void onBackCancelled() {
		super.onBackCancelled();

+7 −0

Original line number	Diff line number	Diff line
		@@ -59,6 +59,7 @@ public class WidgetsEduView extends AbstractSlideInView<BaseActivity> 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<BaseActivity> implements
		mContent.getPaddingTop(), mContent.getPaddingEnd(), insets.bottom);
		}

		@Override
		protected void onScaleProgressChanged() {
		super.onScaleProgressChanged();
		setTranslationY(getMeasuredHeight() * (1 - mSlideInViewScale.value) / 2);
		}

		private void show() {
		attachToContainer();
		animateOpen();