Merge "Don't clear translation state on temporary detachment." into tm-dev

1 files changed, 3 insertions, 1 deletions

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 90497e7adbf7..ba6ba63e4ed0 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -10000,7 +10000,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
             // We reset any translation state as views may be re-used (e.g., as in ListView and
             // RecyclerView). We only need to do this for views important for content capture since
             // views unimportant for content capture won't be translated anyway.
-            clearTranslationState();
+            if (!isTemporarilyDetached()) {
+                clearTranslationState();
+            }
         }
     }