Skip to content

Commit 91c2530

Browse files
pekingmeveganafro
pekingme
authored and
veganafro
committed
[Tokens] Migrated deprecated motion token generated resources.
PiperOrigin-RevId: 434493204
1 parent 69121c8 commit 91c2530

File tree

3 files changed

+32
-53
lines changed

3 files changed

+32
-53
lines changed

‎lib/java/com/google/android/material/dialog/res/values/themes_base.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -189,15 +189,15 @@
189189
<!-- Motion-->
190190
<item name="motionEasingStandard">@string/m3_sys_motion_easing_standard</item>
191191
<item name="motionEasingEmphasized">@string/m3_sys_motion_easing_emphasized</item>
192-
<item name="motionEasingDecelerated">@string/m3_sys_motion_easing_decelerated</item>
193-
<item name="motionEasingAccelerated">@string/m3_sys_motion_easing_accelerated</item>
192+
<item name="motionEasingDecelerated">@string/m3_sys_motion_easing_legacy_decelerate</item>
193+
<item name="motionEasingAccelerated">@string/m3_sys_motion_easing_legacy_accelerate</item>
194194
<item name="motionEasingLinear">@string/m3_sys_motion_easing_linear</item>
195-
<item name="motionDurationShort1">@integer/m3_sys_motion_duration_short1</item>
196-
<item name="motionDurationShort2">@integer/m3_sys_motion_duration_short2</item>
197-
<item name="motionDurationMedium1">@integer/m3_sys_motion_duration_medium1</item>
198-
<item name="motionDurationMedium2">@integer/m3_sys_motion_duration_medium2</item>
199-
<item name="motionDurationLong1">@integer/m3_sys_motion_duration_long1</item>
200-
<item name="motionDurationLong2">@integer/m3_sys_motion_duration_long2</item>
195+
<item name="motionDurationShort1">@integer/m3_sys_motion_duration_100</item>
196+
<item name="motionDurationShort2">@integer/m3_sys_motion_duration_200</item>
197+
<item name="motionDurationMedium1">@integer/m3_sys_motion_duration_300</item>
198+
<item name="motionDurationMedium2">@integer/m3_sys_motion_duration_400</item>
199+
<item name="motionDurationLong1">@integer/m3_sys_motion_duration_500</item>
200+
<item name="motionDurationLong2">@integer/m3_sys_motion_duration_600</item>
201201
<item name="motionPath">@integer/m3_sys_motion_path</item>
202202

203203
<!-- Elevation overlays. -->
@@ -388,15 +388,15 @@
388388
<!-- Motion-->
389389
<item name="motionEasingStandard">@string/m3_sys_motion_easing_standard</item>
390390
<item name="motionEasingEmphasized">@string/m3_sys_motion_easing_emphasized</item>
391-
<item name="motionEasingDecelerated">@string/m3_sys_motion_easing_decelerated</item>
392-
<item name="motionEasingAccelerated">@string/m3_sys_motion_easing_accelerated</item>
391+
<item name="motionEasingDecelerated">@string/m3_sys_motion_easing_legacy_decelerate</item>
392+
<item name="motionEasingAccelerated">@string/m3_sys_motion_easing_legacy_accelerate</item>
393393
<item name="motionEasingLinear">@string/m3_sys_motion_easing_linear</item>
394-
<item name="motionDurationShort1">@integer/m3_sys_motion_duration_short1</item>
395-
<item name="motionDurationShort2">@integer/m3_sys_motion_duration_short2</item>
396-
<item name="motionDurationMedium1">@integer/m3_sys_motion_duration_medium1</item>
397-
<item name="motionDurationMedium2">@integer/m3_sys_motion_duration_medium2</item>
398-
<item name="motionDurationLong1">@integer/m3_sys_motion_duration_long1</item>
399-
<item name="motionDurationLong2">@integer/m3_sys_motion_duration_long2</item>
394+
<item name="motionDurationShort1">@integer/m3_sys_motion_duration_100</item>
395+
<item name="motionDurationShort2">@integer/m3_sys_motion_duration_200</item>
396+
<item name="motionDurationMedium1">@integer/m3_sys_motion_duration_300</item>
397+
<item name="motionDurationMedium2">@integer/m3_sys_motion_duration_400</item>
398+
<item name="motionDurationLong1">@integer/m3_sys_motion_duration_500</item>
399+
<item name="motionDurationLong2">@integer/m3_sys_motion_duration_600</item>
400400
<item name="motionPath">@integer/m3_sys_motion_path</item>
401401

402402
<!-- Elevation overlays. -->

‎lib/java/com/google/android/material/motion/res/values/tokens.xml‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -104,25 +104,4 @@
104104
<item name="m3_sys_motion_easing_emphasized_decelerate_control_y1" format="float" type="dimen">0.7</item>
105105
<item name="m3_sys_motion_easing_emphasized_decelerate_control_x2" format="float" type="dimen">0.1</item>
106106
<item name="m3_sys_motion_easing_emphasized_decelerate_control_y2" format="float" type="dimen">1.0</item>
107-
<!-- Deprecated tokens -->
108-
<integer name="m3_sys_motion_duration_short1">100</integer>
109-
<integer name="m3_sys_motion_duration_short2">200</integer>
110-
<integer name="m3_sys_motion_duration_medium1">300</integer>
111-
<integer name="m3_sys_motion_duration_medium2">400</integer>
112-
<integer name="m3_sys_motion_duration_long1">500</integer>
113-
<integer name="m3_sys_motion_duration_long2">600</integer>
114-
<!-- Easing string used in Material's MotionUtils class. -->
115-
<string name="m3_sys_motion_easing_accelerated" translatable="false">cubic-bezier(0.4, 0.0, 1.0, 1.0)</string>
116-
<!-- Control points used in <pathInterpolator> resources. -->
117-
<item name="m3_sys_motion_easing_accelerated_control_x1" format="float" type="dimen">0.4</item>
118-
<item name="m3_sys_motion_easing_accelerated_control_y1" format="float" type="dimen">0.0</item>
119-
<item name="m3_sys_motion_easing_accelerated_control_x2" format="float" type="dimen">1.0</item>
120-
<item name="m3_sys_motion_easing_accelerated_control_y2" format="float" type="dimen">1.0</item>
121-
<!-- Easing string used in Material's MotionUtils class. -->
122-
<string name="m3_sys_motion_easing_decelerated" translatable="false">cubic-bezier(0.0, 0.0, 0.2, 1.0)</string>
123-
<!-- Control points used in <pathInterpolator> resources. -->
124-
<item name="m3_sys_motion_easing_decelerated_control_x1" format="float" type="dimen">0.0</item>
125-
<item name="m3_sys_motion_easing_decelerated_control_y1" format="float" type="dimen">0.0</item>
126-
<item name="m3_sys_motion_easing_decelerated_control_x2" format="float" type="dimen">0.2</item>
127-
<item name="m3_sys_motion_easing_decelerated_control_y2" format="float" type="dimen">1.0</item>
128107
</resources>

‎lib/java/com/google/android/material/theme/res/values/themes_base.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -201,15 +201,15 @@
201201
<!-- Motion-->
202202
<item name="motionEasingStandard">@string/m3_sys_motion_easing_standard</item>
203203
<item name="motionEasingEmphasized">@string/m3_sys_motion_easing_emphasized</item>
204-
<item name="motionEasingDecelerated">@string/m3_sys_motion_easing_decelerated</item>
205-
<item name="motionEasingAccelerated">@string/m3_sys_motion_easing_accelerated</item>
204+
<item name="motionEasingDecelerated">@string/m3_sys_motion_easing_legacy_decelerate</item>
205+
<item name="motionEasingAccelerated">@string/m3_sys_motion_easing_legacy_accelerate</item>
206206
<item name="motionEasingLinear">@string/m3_sys_motion_easing_linear</item>
207-
<item name="motionDurationShort1">@integer/m3_sys_motion_duration_short1</item>
208-
<item name="motionDurationShort2">@integer/m3_sys_motion_duration_short2</item>
209-
<item name="motionDurationMedium1">@integer/m3_sys_motion_duration_medium1</item>
210-
<item name="motionDurationMedium2">@integer/m3_sys_motion_duration_medium2</item>
211-
<item name="motionDurationLong1">@integer/m3_sys_motion_duration_long1</item>
212-
<item name="motionDurationLong2">@integer/m3_sys_motion_duration_long2</item>
207+
<item name="motionDurationShort1">@integer/m3_sys_motion_duration_100</item>
208+
<item name="motionDurationShort2">@integer/m3_sys_motion_duration_200</item>
209+
<item name="motionDurationMedium1">@integer/m3_sys_motion_duration_300</item>
210+
<item name="motionDurationMedium2">@integer/m3_sys_motion_duration_400</item>
211+
<item name="motionDurationLong1">@integer/m3_sys_motion_duration_500</item>
212+
<item name="motionDurationLong2">@integer/m3_sys_motion_duration_600</item>
213213
<item name="motionPath">@integer/m3_sys_motion_path</item>
214214

215215
<!-- Elevation overlays. -->
@@ -402,15 +402,15 @@
402402
<!-- Motion-->
403403
<item name="motionEasingStandard">@string/m3_sys_motion_easing_standard</item>
404404
<item name="motionEasingEmphasized">@string/m3_sys_motion_easing_emphasized</item>
405-
<item name="motionEasingDecelerated">@string/m3_sys_motion_easing_decelerated</item>
406-
<item name="motionEasingAccelerated">@string/m3_sys_motion_easing_accelerated</item>
405+
<item name="motionEasingDecelerated">@string/m3_sys_motion_easing_legacy_decelerate</item>
406+
<item name="motionEasingAccelerated">@string/m3_sys_motion_easing_legacy_accelerate</item>
407407
<item name="motionEasingLinear">@string/m3_sys_motion_easing_linear</item>
408-
<item name="motionDurationShort1">@integer/m3_sys_motion_duration_short1</item>
409-
<item name="motionDurationShort2">@integer/m3_sys_motion_duration_short2</item>
410-
<item name="motionDurationMedium1">@integer/m3_sys_motion_duration_medium1</item>
411-
<item name="motionDurationMedium2">@integer/m3_sys_motion_duration_medium2</item>
412-
<item name="motionDurationLong1">@integer/m3_sys_motion_duration_long1</item>
413-
<item name="motionDurationLong2">@integer/m3_sys_motion_duration_long2</item>
408+
<item name="motionDurationShort1">@integer/m3_sys_motion_duration_100</item>
409+
<item name="motionDurationShort2">@integer/m3_sys_motion_duration_200</item>
410+
<item name="motionDurationMedium1">@integer/m3_sys_motion_duration_300</item>
411+
<item name="motionDurationMedium2">@integer/m3_sys_motion_duration_400</item>
412+
<item name="motionDurationLong1">@integer/m3_sys_motion_duration_500</item>
413+
<item name="motionDurationLong2">@integer/m3_sys_motion_duration_600</item>
414414
<item name="motionPath">@integer/m3_sys_motion_path</item>
415415

416416
<!-- Elevation overlays. -->

0 commit comments

Comments
 (0)