From 3fc3ec1153ef686b6a644d99641697a9b0c95220 Mon Sep 17 00:00:00 2001
From: hunterstich <hunterstich@google.com>
Date: Wed, 9 Nov 2022 14:42:30 +0000
Subject: [PATCH] [Switch] Update animations to use motion themeing.

PiperOrigin-RevId: 487228839
---
 .../mtrl_switch_thumb_checked_pressed.xml     |  4 +-
 .../mtrl_switch_thumb_checked_unchecked.xml   | 48 ++++++++++---------
 .../mtrl_switch_thumb_pressed_checked.xml     |  4 +-
 .../mtrl_switch_thumb_pressed_unchecked.xml   |  4 +-
 .../mtrl_switch_thumb_unchecked_checked.xml   | 48 ++++++++++---------
 .../mtrl_switch_thumb_unchecked_pressed.xml   |  4 +-
 .../materialswitch/res/values/integers.xml    |  5 --
 7 files changed, 58 insertions(+), 59 deletions(-)

diff --git a/lib/java/com/google/android/material/materialswitch/res/drawable/mtrl_switch_thumb_checked_pressed.xml b/lib/java/com/google/android/material/materialswitch/res/drawable/mtrl_switch_thumb_checked_pressed.xml
index a1b84ed77bb..0529abc037a 100644
--- a/lib/java/com/google/android/material/materialswitch/res/drawable/mtrl_switch_thumb_checked_pressed.xml
+++ b/lib/java/com/google/android/material/materialswitch/res/drawable/mtrl_switch_thumb_checked_pressed.xml
@@ -23,8 +23,8 @@
   <target android:name="@string/mtrl_switch_thumb_path_name">
     <aapt:attr name="android:animation">
       <objectAnimator
-        android:duration="@integer/mtrl_switch_thumb_pressed_duration"
-        android:interpolator="@android:interpolator/accelerate_decelerate"
+        android:duration="?attr/motionDurationShort3"
+        android:interpolator="?attr/motionEasingStandardInterpolator"
         android:propertyName="pathData"
         android:valueFrom="@string/mtrl_switch_thumb_path_checked"
         android:valueTo="@string/mtrl_switch_thumb_path_pressed"
diff --git a/lib/java/com/google/android/material/materialswitch/res/drawable/mtrl_switch_thumb_checked_unchecked.xml b/lib/java/com/google/android/material/materialswitch/res/drawable/mtrl_switch_thumb_checked_unchecked.xml
index c307aba7648..e24cf3419b4 100644
--- a/lib/java/com/google/android/material/materialswitch/res/drawable/mtrl_switch_thumb_checked_unchecked.xml
+++ b/lib/java/com/google/android/material/materialswitch/res/drawable/mtrl_switch_thumb_checked_unchecked.xml
@@ -20,27 +20,29 @@
   android:drawable="@drawable/mtrl_switch_thumb_checked"
   tools:ignore="NewApi">
 
-  <target android:name="@string/mtrl_switch_thumb_path_name">
-    <aapt:attr name="android:animation">
-      <objectAnimator
-        android:duration="@integer/mtrl_switch_thumb_pre_morphing_duration"
-        android:interpolator="@android:interpolator/accelerate_decelerate"
-        android:propertyName="pathData"
-        android:valueFrom="@string/mtrl_switch_thumb_path_checked"
-        android:valueTo="@string/mtrl_switch_thumb_path_morphing"
-        android:valueType="pathType" />
-    </aapt:attr>
-  </target>
-  <target android:name="@string/mtrl_switch_thumb_path_name">
-    <aapt:attr name="android:animation">
-      <objectAnimator
-        android:startOffset="@integer/mtrl_switch_thumb_pre_morphing_duration"
-        android:duration="@integer/mtrl_switch_thumb_post_morphing_duration"
-        android:interpolator="@android:interpolator/accelerate_decelerate"
-        android:propertyName="pathData"
-        android:valueFrom="@string/mtrl_switch_thumb_path_morphing"
-        android:valueTo="@string/mtrl_switch_thumb_path_unchecked"
-        android:valueType="pathType" />
-    </aapt:attr>
-  </target>
+  <set
+    android:interpolator="?attr/motionEasingEmphasizedInterpolator"
+    android:shareInterpolator="true">
+    <target android:name="@string/mtrl_switch_thumb_path_name">
+      <aapt:attr name="android:animation">
+        <objectAnimator
+          android:duration="?attr/motionDurationShort3"
+          android:propertyName="pathData"
+          android:valueFrom="@string/mtrl_switch_thumb_path_checked"
+          android:valueTo="@string/mtrl_switch_thumb_path_morphing"
+          android:valueType="pathType" />
+      </aapt:attr>
+    </target>
+    <target android:name="@string/mtrl_switch_thumb_path_name">
+      <aapt:attr name="android:animation">
+        <objectAnimator
+          android:duration="?attr/motionDurationMedium1"
+          android:propertyName="pathData"
+          android:startOffset="?attr/motionDurationShort3"
+          android:valueFrom="@string/mtrl_switch_thumb_path_morphing"
+          android:valueTo="@string/mtrl_switch_thumb_path_unchecked"
+          android:valueType="pathType" />
+      </aapt:attr>
+    </target>
+  </set>
 </animated-vector>
diff --git a/lib/java/com/google/android/material/materialswitch/res/drawable/mtrl_switch_thumb_pressed_checked.xml b/lib/java/com/google/android/material/materialswitch/res/drawable/mtrl_switch_thumb_pressed_checked.xml
index 353370e6353..99330d71606 100644
--- a/lib/java/com/google/android/material/materialswitch/res/drawable/mtrl_switch_thumb_pressed_checked.xml
+++ b/lib/java/com/google/android/material/materialswitch/res/drawable/mtrl_switch_thumb_pressed_checked.xml
@@ -23,8 +23,8 @@
   <target android:name="@string/mtrl_switch_thumb_path_name">
     <aapt:attr name="android:animation">
       <objectAnimator
-        android:duration="@integer/mtrl_switch_thumb_pressed_duration"
-        android:interpolator="@android:interpolator/accelerate_decelerate"
+        android:duration="?attr/motionDurationShort3"
+        android:interpolator="?attr/motionEasingStandardInterpolator"
         android:propertyName="pathData"
         android:valueFrom="@string/mtrl_switch_thumb_path_pressed"
         android:valueTo="@string/mtrl_switch_thumb_path_checked"
diff --git a/lib/java/com/google/android/material/materialswitch/res/drawable/mtrl_switch_thumb_pressed_unchecked.xml b/lib/java/com/google/android/material/materialswitch/res/drawable/mtrl_switch_thumb_pressed_unchecked.xml
index 948e39e579a..cd0e77c9550 100644
--- a/lib/java/com/google/android/material/materialswitch/res/drawable/mtrl_switch_thumb_pressed_unchecked.xml
+++ b/lib/java/com/google/android/material/materialswitch/res/drawable/mtrl_switch_thumb_pressed_unchecked.xml
@@ -23,8 +23,8 @@
   <target android:name="@string/mtrl_switch_thumb_path_name">
     <aapt:attr name="android:animation">
       <objectAnimator
-        android:duration="@integer/mtrl_switch_thumb_pressed_duration"
-        android:interpolator="@android:interpolator/accelerate_decelerate"
+        android:duration="?attr/motionDurationShort3"
+        android:interpolator="?attr/motionEasingEmphasizedInterpolator"
         android:propertyName="pathData"
         android:valueFrom="@string/mtrl_switch_thumb_path_pressed"
         android:valueTo="@string/mtrl_switch_thumb_path_unchecked"
diff --git a/lib/java/com/google/android/material/materialswitch/res/drawable/mtrl_switch_thumb_unchecked_checked.xml b/lib/java/com/google/android/material/materialswitch/res/drawable/mtrl_switch_thumb_unchecked_checked.xml
index 19738ba1115..52874356831 100644
--- a/lib/java/com/google/android/material/materialswitch/res/drawable/mtrl_switch_thumb_unchecked_checked.xml
+++ b/lib/java/com/google/android/material/materialswitch/res/drawable/mtrl_switch_thumb_unchecked_checked.xml
@@ -20,27 +20,29 @@
   android:drawable="@drawable/mtrl_switch_thumb_unchecked"
   tools:ignore="NewApi">
 
-  <target android:name="@string/mtrl_switch_thumb_path_name">
-    <aapt:attr name="android:animation">
-      <objectAnimator
-        android:duration="@integer/mtrl_switch_thumb_post_morphing_duration"
-        android:interpolator="@android:interpolator/accelerate_decelerate"
-        android:propertyName="pathData"
-        android:valueFrom="@string/mtrl_switch_thumb_path_unchecked"
-        android:valueTo="@string/mtrl_switch_thumb_path_morphing"
-        android:valueType="pathType" />
-    </aapt:attr>
-  </target>
-  <target android:name="@string/mtrl_switch_thumb_path_name">
-    <aapt:attr name="android:animation">
-      <objectAnimator
-        android:startOffset="@integer/mtrl_switch_thumb_post_morphing_duration"
-        android:duration="@integer/mtrl_switch_thumb_pre_morphing_duration"
-        android:interpolator="@android:interpolator/accelerate_decelerate"
-        android:propertyName="pathData"
-        android:valueFrom="@string/mtrl_switch_thumb_path_morphing"
-        android:valueTo="@string/mtrl_switch_thumb_path_checked"
-        android:valueType="pathType" />
-    </aapt:attr>
-  </target>
+  <set
+    android:interpolator="?attr/motionEasingEmphasizedInterpolator"
+    android:shareInterpolator="true">
+    <target android:name="@string/mtrl_switch_thumb_path_name">
+      <aapt:attr name="android:animation">
+        <objectAnimator
+          android:duration="?attr/motionDurationMedium1"
+          android:propertyName="pathData"
+          android:valueFrom="@string/mtrl_switch_thumb_path_unchecked"
+          android:valueTo="@string/mtrl_switch_thumb_path_morphing"
+          android:valueType="pathType" />
+      </aapt:attr>
+    </target>
+    <target android:name="@string/mtrl_switch_thumb_path_name">
+      <aapt:attr name="android:animation">
+        <objectAnimator
+          android:duration="?attr/motionDurationShort3"
+          android:propertyName="pathData"
+          android:startOffset="?attr/motionDurationMedium1"
+          android:valueFrom="@string/mtrl_switch_thumb_path_morphing"
+          android:valueTo="@string/mtrl_switch_thumb_path_checked"
+          android:valueType="pathType" />
+      </aapt:attr>
+    </target>
+  </set>
 </animated-vector>
diff --git a/lib/java/com/google/android/material/materialswitch/res/drawable/mtrl_switch_thumb_unchecked_pressed.xml b/lib/java/com/google/android/material/materialswitch/res/drawable/mtrl_switch_thumb_unchecked_pressed.xml
index 5c50b3f0dbf..2945c60721b 100644
--- a/lib/java/com/google/android/material/materialswitch/res/drawable/mtrl_switch_thumb_unchecked_pressed.xml
+++ b/lib/java/com/google/android/material/materialswitch/res/drawable/mtrl_switch_thumb_unchecked_pressed.xml
@@ -23,8 +23,8 @@
   <target android:name="@string/mtrl_switch_thumb_path_name">
     <aapt:attr name="android:animation">
       <objectAnimator
-        android:duration="@integer/mtrl_switch_thumb_pressed_duration"
-        android:interpolator="@android:interpolator/accelerate_decelerate"
+        android:duration="?attr/motionDurationShort3"
+        android:interpolator="?attr/motionEasingStandardInterpolator"
         android:propertyName="pathData"
         android:valueFrom="@string/mtrl_switch_thumb_path_unchecked"
         android:valueTo="@string/mtrl_switch_thumb_path_pressed"
diff --git a/lib/java/com/google/android/material/materialswitch/res/values/integers.xml b/lib/java/com/google/android/material/materialswitch/res/values/integers.xml
index a4cabb79c6c..f02831517ce 100644
--- a/lib/java/com/google/android/material/materialswitch/res/values/integers.xml
+++ b/lib/java/com/google/android/material/materialswitch/res/values/integers.xml
@@ -16,11 +16,6 @@
   -->
 
 <resources>
-  <integer name="mtrl_switch_thumb_motion_duration">250</integer>
-  <integer name="mtrl_switch_thumb_pre_morphing_duration">100</integer>
-  <integer name="mtrl_switch_thumb_post_morphing_duration">150</integer>
-  <integer name="mtrl_switch_thumb_pressed_duration">100</integer>
-
   <integer name="mtrl_switch_thumb_viewport_size">32</integer>
   <integer name="mtrl_switch_thumb_viewport_center_coordinate">16</integer>