[Transition] Update MaterialContainerTransform to use getLocationInWindow() instead of getLocationOnScreen() when calculating bounds

Fixes issue where start / end view jump during transition in landscape mode when there is an artificial inset due to the camera hole / other display cutouts

PiperOrigin-RevId: 631421213

Author: dsn5ft

lib/java/com/google/android/material/transition/MaterialContainerTransform.java

@@ -26,7 +26,7 @@
 import static com.google.android.material.transition.TransitionUtils.defaultIfNull;
 import static com.google.android.material.transition.TransitionUtils.findAncestorById;
 import static com.google.android.material.transition.TransitionUtils.findDescendantOrAncestorById;
-import static com.google.android.material.transition.TransitionUtils.getLocationOnScreen;
+import static com.google.android.material.transition.TransitionUtils.getLocationInWindow;
 import static com.google.android.material.transition.TransitionUtils.getRelativeBounds;
 import static com.google.android.material.transition.TransitionUtils.lerp;
 import static com.google.android.material.transition.TransitionUtils.transform;
@@ -828,7 +828,7 @@ private static void captureValues(
 
     if (ViewCompat.isLaidOut(view) || view.getWidth() != 0 || view.getHeight() != 0) {
       // Capture location in screen co-ordinates
-      RectF bounds = view.getParent() == null ? getRelativeBounds(view) : getLocationOnScreen(view);
+      RectF bounds = view.getParent() == null ? getRelativeBounds(view) : getLocationInWindow(view);
       transitionValues.values.put(PROP_BOUNDS, bounds);
       transitionValues.values.put(
           PROP_SHAPE_APPEARANCE,
@@ -919,7 +919,7 @@ public Animator createAnimator(
     }
 
     // Calculate drawable bounds and offset start/end bounds as needed
-    RectF drawingViewBounds = getLocationOnScreen(drawingView);
+    RectF drawingViewBounds = getLocationInWindow(drawingView);
     float offsetX = -drawingViewBounds.left;
     float offsetY = -drawingViewBounds.top;
     RectF drawableBounds = calculateDrawableBounds(drawingView, boundingView, offsetX, offsetY);
@@ -1023,7 +1023,7 @@ private static float getElevationOrDefault(float elevation, View view) {
   private static RectF calculateDrawableBounds(
       View drawingView, @Nullable View boundingView, float offsetX, float offsetY) {
     if (boundingView != null) {
-      RectF drawableBounds = getLocationOnScreen(boundingView);
+      RectF drawableBounds = getLocationInWindow(boundingView);
       drawableBounds.offset(offsetX, offsetY);
       return drawableBounds;
     } else {

lib/java/com/google/android/material/transition/TransitionUtils.java

@@ -295,9 +295,9 @@ static Rect getRelativeBoundsRect(View view) {
     return new Rect(view.getLeft(), view.getTop(), view.getRight(), view.getBottom());
   }
 
-  static RectF getLocationOnScreen(View view) {
+  static RectF getLocationInWindow(View view) {
     int[] location = new int[2];
-    view.getLocationOnScreen(location);
+    view.getLocationInWindow(location);
     int left = location[0];
     int top = location[1];
     int right = left + view.getWidth();

lib/java/com/google/android/material/transition/platform/MaterialContainerTransform.java

@@ -30,7 +30,7 @@
 import static com.google.android.material.transition.platform.TransitionUtils.defaultIfNull;
 import static com.google.android.material.transition.platform.TransitionUtils.findAncestorById;
 import static com.google.android.material.transition.platform.TransitionUtils.findDescendantOrAncestorById;
-import static com.google.android.material.transition.platform.TransitionUtils.getLocationOnScreen;
+import static com.google.android.material.transition.platform.TransitionUtils.getLocationInWindow;
 import static com.google.android.material.transition.platform.TransitionUtils.getRelativeBounds;
 import static com.google.android.material.transition.platform.TransitionUtils.lerp;
 import static com.google.android.material.transition.platform.TransitionUtils.transform;
@@ -833,7 +833,7 @@ private static void captureValues(
 
     if (ViewCompat.isLaidOut(view) || view.getWidth() != 0 || view.getHeight() != 0) {
       // Capture location in screen co-ordinates
-      RectF bounds = view.getParent() == null ? getRelativeBounds(view) : getLocationOnScreen(view);
+      RectF bounds = view.getParent() == null ? getRelativeBounds(view) : getLocationInWindow(view);
       transitionValues.values.put(PROP_BOUNDS, bounds);
       transitionValues.values.put(
           PROP_SHAPE_APPEARANCE,
@@ -924,7 +924,7 @@ public Animator createAnimator(
     }
 
     // Calculate drawable bounds and offset start/end bounds as needed
-    RectF drawingViewBounds = getLocationOnScreen(drawingView);
+    RectF drawingViewBounds = getLocationInWindow(drawingView);
     float offsetX = -drawingViewBounds.left;
     float offsetY = -drawingViewBounds.top;
     RectF drawableBounds = calculateDrawableBounds(drawingView, boundingView, offsetX, offsetY);
@@ -1028,7 +1028,7 @@ private static float getElevationOrDefault(float elevation, View view) {
   private static RectF calculateDrawableBounds(
       View drawingView, @Nullable View boundingView, float offsetX, float offsetY) {
     if (boundingView != null) {
-      RectF drawableBounds = getLocationOnScreen(boundingView);
+      RectF drawableBounds = getLocationInWindow(boundingView);
       drawableBounds.offset(offsetX, offsetY);
       return drawableBounds;
     } else {

lib/java/com/google/android/material/transition/platform/TransitionUtils.java

@@ -300,9 +300,9 @@ static Rect getRelativeBoundsRect(View view) {
     return new Rect(view.getLeft(), view.getTop(), view.getRight(), view.getBottom());
   }
 
-  static RectF getLocationOnScreen(View view) {
+  static RectF getLocationInWindow(View view) {
     int[] location = new int[2];
-    view.getLocationOnScreen(location);
+    view.getLocationInWindow(location);
     int left = location[0];
     int top = location[1];
     int right = left + view.getWidth();