[Predictive Back] Make back helpers support generified View type

PiperOrigin-RevId: 523442268
material-components · Apr 13, 2023 · 69b5386 · 69b5386
1 parent 77cdc1e
commit 69b5386
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/lib/java/com/google/android/material/motion/MaterialBackAnimationHelper.java b/lib/java/com/google/android/material/motion/MaterialBackAnimationHelper.java
@@ -25,29 +25,34 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
 import androidx.core.view.animation.PathInterpolatorCompat;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 
 /**
  * Base helper class for views that support back handling, which assists with common animation
  * details and back event validation.
+ *
+ * @hide
  */
-abstract class MaterialBackAnimationHelper {
+@RestrictTo(Scope.LIBRARY_GROUP)
+public abstract class MaterialBackAnimationHelper<V extends View> {
 
   private static final int HIDE_DURATION_MAX_DEFAULT = 300;
   private static final int HIDE_DURATION_MIN_DEFAULT = 150;
   private static final int CANCEL_DURATION_DEFAULT = 100;
 
   @NonNull private final TimeInterpolator progressInterpolator;
 
-  @NonNull protected final View view;
+  @NonNull protected final V view;
   protected final int hideDurationMax;
   protected final int hideDurationMin;
   protected final int cancelDuration;
 
   @Nullable private BackEvent backEvent;
 
-  public MaterialBackAnimationHelper(@NonNull View view) {
+  public MaterialBackAnimationHelper(@NonNull V view) {
     this.view = view;
 
     Context context = view.getContext();

diff --git a/lib/java/com/google/android/material/motion/MaterialBottomContainerBackHelper.java b/lib/java/com/google/android/material/motion/MaterialBottomContainerBackHelper.java
@@ -44,7 +44,7 @@
  * @hide
  */
 @RestrictTo(LIBRARY_GROUP)
-public class MaterialBottomContainerBackHelper extends MaterialBackAnimationHelper {
+public class MaterialBottomContainerBackHelper extends MaterialBackAnimationHelper<View> {
 
   private final float maxScaleXDistance;
   private final float maxScaleYDistance;

diff --git a/lib/java/com/google/android/material/motion/MaterialMainContainerBackHelper.java b/lib/java/com/google/android/material/motion/MaterialMainContainerBackHelper.java
@@ -51,7 +51,7 @@
  * @hide
  */
 @RestrictTo(LIBRARY_GROUP)
-public class MaterialMainContainerBackHelper extends MaterialBackAnimationHelper {
+public class MaterialMainContainerBackHelper extends MaterialBackAnimationHelper<View> {
 
   private static final float MIN_SCALE = 0.9f;
 

diff --git a/lib/java/com/google/android/material/motion/MaterialSideContainerBackHelper.java b/lib/java/com/google/android/material/motion/MaterialSideContainerBackHelper.java
@@ -49,7 +49,7 @@
  * @hide
  */
 @RestrictTo(LIBRARY_GROUP)
-public class MaterialSideContainerBackHelper extends MaterialBackAnimationHelper {
+public class MaterialSideContainerBackHelper extends MaterialBackAnimationHelper<View> {
 
   private final float maxScaleXDistanceShrink;
   private final float maxScaleXDistanceGrow;