[Predictive Back][Search] Only use device corner radius if SearchView…

… reaches edge of screen PiperOrigin-RevId: 524283122
material-components · Apr 17, 2023 · a93c91a · a93c91a
1 parent 1c01e82
commit a93c91a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/lib/java/com/google/android/material/motion/MaterialMainContainerBackHelper.java b/lib/java/com/google/android/material/motion/MaterialMainContainerBackHelper.java
@@ -61,7 +61,7 @@ public class MaterialMainContainerBackHelper extends MaterialBackAnimationHelper
   private float initialTouchY;
   @Nullable private Rect initialHideToClipBounds;
   @Nullable private Rect initialHideFromClipBounds;
-  @Nullable private Integer deviceCornerRadius;
+  @Nullable private Integer expandedCornerSize;
 
   public MaterialMainContainerBackHelper(@NonNull View view) {
     super(view);
@@ -132,7 +132,7 @@ public void updateBackProgress(
     view.setTranslationY(translationY);
     if (view instanceof ClippableRoundedCornerLayout) {
       ((ClippableRoundedCornerLayout) view)
-          .updateCornerRadius(lerp(getDeviceCornerRadius(), collapsedCornerSize, progress));
+          .updateCornerRadius(lerp(getExpandedCornerSize(), collapsedCornerSize, progress));
     }
   }
 
@@ -187,18 +187,24 @@ private ValueAnimator createCornerAnimator(
       ClippableRoundedCornerLayout clippableRoundedCornerLayout) {
     ValueAnimator cornerAnimator =
         ValueAnimator.ofFloat(
-            clippableRoundedCornerLayout.getCornerRadius(), getDeviceCornerRadius());
+            clippableRoundedCornerLayout.getCornerRadius(), getExpandedCornerSize());
     cornerAnimator.addUpdateListener(
         animation ->
             clippableRoundedCornerLayout.updateCornerRadius((Float) animation.getAnimatedValue()));
     return cornerAnimator;
   }
 
-  public int getDeviceCornerRadius() {
-    if (deviceCornerRadius == null) {
-      deviceCornerRadius = getMaxDeviceCornerRadius();
+  public int getExpandedCornerSize() {
+    if (expandedCornerSize == null) {
+      expandedCornerSize = isAtTopOfScreen() ? getMaxDeviceCornerRadius() : 0;
     }
-    return deviceCornerRadius;
+    return expandedCornerSize;
+  }
+
+  private boolean isAtTopOfScreen() {
+    int[] location = new int[2];
+    view.getLocationOnScreen(location);
+    return location[1] == 0;
   }
 
   private int getMaxDeviceCornerRadius() {

diff --git a/lib/java/com/google/android/material/search/SearchViewAnimationHelper.java b/lib/java/com/google/android/material/search/SearchViewAnimationHelper.java
@@ -347,7 +347,7 @@ private Animator getRootViewAnimator(boolean show) {
     Rect clipBounds = new Rect(fromClipBounds);
 
     float fromCornerRadius = searchBar.getCornerSize();
-    float toCornerRadius = max(rootView.getCornerRadius(), backHelper.getDeviceCornerRadius());
+    float toCornerRadius = max(rootView.getCornerRadius(), backHelper.getExpandedCornerSize());
 
     ValueAnimator animator =
         ValueAnimator.ofObject(new RectEvaluator(clipBounds), fromClipBounds, toClipBounds);