Skip to content

Commit edd2eb5

Browse files
committed
[Motion] Updated motion theming attr names.
PiperOrigin-RevId: 356983952
1 parent 2933600 commit edd2eb5

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@
9393
<!-- Motion -->
9494
<item name="motionEasingStandard">@string/material_motion_easing_standard</item>
9595
<item name="motionEasingEmphasized">@string/material_motion_easing_emphasized</item>
96-
<item name="motionEasingDecelerate">@string/material_motion_easing_decelerate</item>
97-
<item name="motionEasingAccelerate">@string/material_motion_easing_accelerate</item>
96+
<item name="motionEasingDecelerated">@string/material_motion_easing_decelerated</item>
97+
<item name="motionEasingAccelerated">@string/material_motion_easing_accelerated</item>
9898
<item name="motionEasingLinear">@string/material_motion_easing_linear</item>
9999

100100
<item name="motionDurationShort1">@integer/material_motion_duration_short_1</item>
@@ -174,8 +174,8 @@
174174
<!-- Motion -->
175175
<item name="motionEasingStandard">@string/material_motion_easing_standard</item>
176176
<item name="motionEasingEmphasized">@string/material_motion_easing_emphasized</item>
177-
<item name="motionEasingDecelerate">@string/material_motion_easing_decelerate</item>
178-
<item name="motionEasingAccelerate">@string/material_motion_easing_accelerate</item>
177+
<item name="motionEasingDecelerated">@string/material_motion_easing_decelerated</item>
178+
<item name="motionEasingAccelerated">@string/material_motion_easing_accelerated</item>
179179
<item name="motionEasingLinear">@string/material_motion_easing_linear</item>
180180

181181
<item name="motionDurationShort1">@integer/material_motion_duration_short_1</item>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@
9595
<!-- Motion -->
9696
<item name="motionEasingStandard">@string/material_motion_easing_standard</item>
9797
<item name="motionEasingEmphasized">@string/material_motion_easing_emphasized</item>
98-
<item name="motionEasingDecelerate">@string/material_motion_easing_decelerate</item>
99-
<item name="motionEasingAccelerate">@string/material_motion_easing_accelerate</item>
98+
<item name="motionEasingDecelerated">@string/material_motion_easing_decelerated</item>
99+
<item name="motionEasingAccelerated">@string/material_motion_easing_accelerated</item>
100100
<item name="motionEasingLinear">@string/material_motion_easing_linear</item>
101101

102102
<item name="motionDurationShort1">@integer/material_motion_duration_short_1</item>
@@ -178,8 +178,8 @@
178178
<!-- Motion -->
179179
<item name="motionEasingStandard">@string/material_motion_easing_standard</item>
180180
<item name="motionEasingEmphasized">@string/material_motion_easing_emphasized</item>
181-
<item name="motionEasingDecelerate">@string/material_motion_easing_decelerate</item>
182-
<item name="motionEasingAccelerate">@string/material_motion_easing_accelerate</item>
181+
<item name="motionEasingDecelerated">@string/material_motion_easing_decelerated</item>
182+
<item name="motionEasingAccelerated">@string/material_motion_easing_accelerated</item>
183183
<item name="motionEasingLinear">@string/material_motion_easing_linear</item>
184184

185185
<item name="motionDurationShort1">@integer/material_motion_duration_short_1</item>
@@ -243,8 +243,8 @@
243243
<!-- Motion -->
244244
<item name="motionEasingStandard">@string/material_motion_easing_standard</item>
245245
<item name="motionEasingEmphasized">@string/material_motion_easing_emphasized</item>
246-
<item name="motionEasingDecelerate">@string/material_motion_easing_decelerate</item>
247-
<item name="motionEasingAccelerate">@string/material_motion_easing_accelerate</item>
246+
<item name="motionEasingDecelerated">@string/material_motion_easing_decelerated</item>
247+
<item name="motionEasingAccelerated">@string/material_motion_easing_accelerated</item>
248248
<item name="motionEasingLinear">@string/material_motion_easing_linear</item>
249249

250250
<item name="motionDurationShort1">@integer/material_motion_duration_short_1</item>

lib/java/com/google/android/material/transition/res-public/values/public.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
<public name="motionEasingStandard" type="attr" />
2020
<public name="motionEasingEmphasized" type="attr" />
21-
<public name="motionEasingDecelerate" type="attr" />
22-
<public name="motionEasingAccelerate" type="attr" />
21+
<public name="motionEasingDecelerated" type="attr" />
22+
<public name="motionEasingAccelerated" type="attr" />
2323
<public name="motionEasingLinear" type="attr" />
2424
<public name="motionDurationShort1" type="attr" />
2525
<public name="motionDurationShort2" type="attr" />
@@ -32,8 +32,8 @@
3232

3333
<public name="material_motion_easing_standard" type="string" />
3434
<public name="material_motion_easing_emphasized" type="string" />
35-
<public name="material_motion_easing_decelerate" type="string" />
36-
<public name="material_motion_easing_accelerate" type="string" />
35+
<public name="material_motion_easing_decelerated" type="string" />
36+
<public name="material_motion_easing_accelerated" type="string" />
3737
<public name="material_motion_easing_linear" type="string" />
3838

3939
<public name="material_motion_duration_short_1" type="integer" />

lib/java/com/google/android/material/transition/res/values/attrs.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
<!-- Incoming elements are animated using decelerated easing, in which
2727
transitions begin at peak velocity and end at rest. Can either be in the
2828
format "cubic-bezier(x1, y1, x2, y2)" or "path(<path_data>)".-->
29-
<attr name="motionEasingDecelerate" format="string"/>
29+
<attr name="motionEasingDecelerated" format="string"/>
3030
<!-- Elements exiting a screen use accelerated easing, a transition in which
3131
the element starts at rest and ends at peak velocity. Can either be in
3232
the format "cubic-bezier(x1, y1, x2, y2)" or "path(<path_data>)". -->
33-
<attr name="motionEasingAccelerate" format="string"/>
33+
<attr name="motionEasingAccelerated" format="string"/>
3434
<!-- Linear easing is often used for simple fade animations. Can either be in
3535
the format "cubic-bezier(x1, y1, x2, y2)" or "path(<path_data>)".-->
3636
<attr name="motionEasingLinear" format="string"/>

lib/java/com/google/android/material/transition/res/values/strings.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
<string name="material_motion_easing_standard" translatable="false">cubic-bezier(0.4, 0.0, 0.2, 1.0)</string>
2020
<string name="material_motion_easing_emphasized" translatable="false">path(M 0,0 C 0.05, 0, 0.133333, 0.06, 0.166666, 0.4 C 0.208333, 0.82, 0.25, 1, 1, 1)</string>
21-
<string name="material_motion_easing_decelerate" translatable="false">cubic-bezier(0.0, 0.0, 0.2, 1.0)</string>
22-
<string name="material_motion_easing_accelerate" translatable="false">cubic-bezier(0.4, 0.0, 1.0, 1.0)</string>
21+
<string name="material_motion_easing_decelerated" translatable="false">cubic-bezier(0.0, 0.0, 0.2, 1.0)</string>
22+
<string name="material_motion_easing_accelerated" translatable="false">cubic-bezier(0.4, 0.0, 1.0, 1.0)</string>
2323
<string name="material_motion_easing_linear" translatable="false">cubic-bezier(0.0, 0.0, 1.0, 1.0)</string>
2424

2525
</resources>

0 commit comments

Comments
 (0)