Skip to content

Commit 59de693

Browse files
hunterstichimhappi
hunterstich
authored and
imhappi
committed
[Motion] Fixed typo for "spatial"
PiperOrigin-RevId: 708423524
1 parent 3f5179c commit 59de693

File tree

10 files changed

+30
-30
lines changed

10 files changed

+30
-30
lines changed

‎catalog/java/io/material/catalog/musicplayer/MusicPlayerLibraryDemoFragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public boolean onMenuItemClick(MenuItem menuItem) {
130130
return true;
131131
}
132132

133-
// Use a shared axis Y transition to sort the list, showing a spacial relationship between
133+
// Use a shared axis Y transition to sort the list, showing a spatial relationship between
134134
// the outgoing and incoming view.
135135
MaterialSharedAxis sharedAxis = new MaterialSharedAxis(MaterialSharedAxis.Y, true);
136136
setList(listTypeGrid, !listSorted, sharedAxis);

‎lib/java/com/google/android/material/button/MaterialButton.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ private void initializeSizeAnimation() {
314314
}
315315

316316
private SpringForce createSpringForce() {
317-
return MotionUtils.resolveThemeSpringForce(getContext(), R.attr.motionSpringFastSpacial);
317+
return MotionUtils.resolveThemeSpringForce(getContext(), R.attr.motionSpringFastSpatial);
318318
}
319319

320320
@NonNull

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -258,11 +258,11 @@
258258
<item name="shapeAppearanceLargeComponent">@style/ShapeAppearance.Material3.LargeComponent</item>
259259

260260
<!-- Motion attributes. -->
261-
<item name="motionSpringFastSpacial">@style/Motion.Material3.Spring.Standard.Fast.Spacial</item>
261+
<item name="motionSpringFastSpatial">@style/Motion.Material3.Spring.Standard.Fast.Spatial</item>
262262
<item name="motionSpringFastEffects">@style/Motion.Material3.Spring.Standard.Fast.Effects</item>
263-
<item name="motionSpringDefaultSpacial">@style/Motion.Material3.Spring.Standard.Default.Spacial</item>
263+
<item name="motionSpringDefaultSpatial">@style/Motion.Material3.Spring.Standard.Default.Spatial</item>
264264
<item name="motionSpringDefaultEffects">@style/Motion.Material3.Spring.Standard.Default.Effects</item>
265-
<item name="motionSpringSlowSpacial">@style/Motion.Material3.Spring.Standard.Slow.Spacial</item>
265+
<item name="motionSpringSlowSpatial">@style/Motion.Material3.Spring.Standard.Slow.Spatial</item>
266266
<item name="motionSpringSlowEffects">@style/Motion.Material3.Spring.Standard.Slow.Effects</item>
267267
<item name="motionEasingStandardInterpolator">@interpolator/m3_sys_motion_easing_standard</item>
268268
<item name="motionEasingStandardDecelerateInterpolator">@interpolator/m3_sys_motion_easing_standard_decelerate</item>
@@ -551,11 +551,11 @@
551551
<item name="shapeAppearanceLargeComponent">@style/ShapeAppearance.Material3.LargeComponent</item>
552552

553553
<!-- Motion attributes. -->
554-
<item name="motionSpringFastSpacial">@style/Motion.Material3.Spring.Standard.Fast.Spacial</item>
554+
<item name="motionSpringFastSpatial">@style/Motion.Material3.Spring.Standard.Fast.Spatial</item>
555555
<item name="motionSpringFastEffects">@style/Motion.Material3.Spring.Standard.Fast.Effects</item>
556-
<item name="motionSpringDefaultSpacial">@style/Motion.Material3.Spring.Standard.Default.Spacial</item>
556+
<item name="motionSpringDefaultSpatial">@style/Motion.Material3.Spring.Standard.Default.Spatial</item>
557557
<item name="motionSpringDefaultEffects">@style/Motion.Material3.Spring.Standard.Default.Effects</item>
558-
<item name="motionSpringSlowSpacial">@style/Motion.Material3.Spring.Standard.Slow.Spacial</item>
558+
<item name="motionSpringSlowSpatial">@style/Motion.Material3.Spring.Standard.Slow.Spatial</item>
559559
<item name="motionSpringSlowEffects">@style/Motion.Material3.Spring.Standard.Slow.Effects</item>
560560
<item name="motionEasingStandardInterpolator">@interpolator/m3_sys_motion_easing_standard</item>
561561
<item name="motionEasingStandardDecelerateInterpolator">@interpolator/m3_sys_motion_easing_standard_decelerate</item>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
<public name="stiffness" type="attr"/>
1919
<public name="damping" type="attr"/>
2020

21-
<public name="motionSpringFastSpacial" type="attr" />
21+
<public name="motionSpringFastSpatial" type="attr" />
2222
<public name="motionSpringFastEffects" type="attr" />
23-
<public name="motionSpringDefaultSpacial" type="attr" />
23+
<public name="motionSpringDefaultSpatial" type="attr" />
2424
<public name="motionSpringDefaultEffects" type="attr" />
25-
<public name="motionSpringSlowSpacial" type="attr" />
25+
<public name="motionSpringSlowSpatial" type="attr" />
2626
<public name="motionSpringSlowEffects" type="attr" />
2727
<public name="motionEasingStandardInterpolator" type="attr" />
2828
<public name="motionEasingStandardDecelerateInterpolator" type="attr" />

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@
2727
</declare-styleable>
2828

2929
<!-- Spring for small components animations such as switches and buttons. -->
30-
<attr name="motionSpringFastSpacial" format="reference" />
30+
<attr name="motionSpringFastSpatial" format="reference" />
3131
<!-- Spring for color or opacity change on small components such as a
3232
switch's thumb changing color. -->
3333
<attr name="motionSpringFastEffects" format="reference" />
3434
<!-- Spring for animations that partially cover the screen such as a bottom
3535
sheet sliding or a navigation rail expanding. -->
36-
<attr name="motionSpringDefaultSpacial" format="reference" />
36+
<attr name="motionSpringDefaultSpatial" format="reference" />
3737
<!-- Spring for color or opacity changes of animations that partially cover
3838
the screen such as the opacity of the navigation rail content as the
3939
rail expands. -->
4040
<attr name="motionSpringDefaultEffects" format="reference" />
4141
<!-- Spring for full screen movements. -->
42-
<attr name="motionSpringSlowSpacial" format="reference" />
42+
<attr name="motionSpringSlowSpatial" format="reference" />
4343
<!-- Spring for full screen color or opacity changes such as content
4444
refreshes. -->
4545
<attr name="motionSpringSlowEffects" format="reference" />

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
~ limitations under the License.
1616
-->
1717
<resources>
18-
<style name="Motion.Material3.Spring.Standard.Fast.Spacial" parent="">
18+
<style name="Motion.Material3.Spring.Standard.Fast.Spatial" parent="">
1919
<item name="stiffness">@dimen/m3_sys_motion_standard_spring_fast_spatial_stiffness</item>
2020
<item name="damping">@dimen/m3_sys_motion_standard_spring_fast_spatial_damping</item>
2121
</style>
22-
<style name="Motion.Material3.Spring.Standard.Default.Spacial" parent="">
22+
<style name="Motion.Material3.Spring.Standard.Default.Spatial" parent="">
2323
<item name="stiffness">@dimen/m3_sys_motion_standard_spring_default_spatial_stiffness</item>
2424
<item name="damping">@dimen/m3_sys_motion_standard_spring_default_spatial_damping</item>
2525
</style>
26-
<style name="Motion.Material3.Spring.Standard.Slow.Spacial" parent="">
26+
<style name="Motion.Material3.Spring.Standard.Slow.Spatial" parent="">
2727
<item name="stiffness">@dimen/m3_sys_motion_standard_spring_slow_spatial_stiffness</item>
2828
<item name="damping">@dimen/m3_sys_motion_standard_spring_slow_spatial_damping</item>
2929
</style>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -272,11 +272,11 @@
272272
<item name="shapeAppearanceLargeComponent">@style/ShapeAppearance.Material3.LargeComponent</item>
273273

274274
<!-- Motion attributes.-->
275-
<item name="motionSpringFastSpacial">@style/Motion.Material3.Spring.Standard.Fast.Spacial</item>
275+
<item name="motionSpringFastSpatial">@style/Motion.Material3.Spring.Standard.Fast.Spatial</item>
276276
<item name="motionSpringFastEffects">@style/Motion.Material3.Spring.Standard.Fast.Effects</item>
277-
<item name="motionSpringDefaultSpacial">@style/Motion.Material3.Spring.Standard.Default.Spacial</item>
277+
<item name="motionSpringDefaultSpatial">@style/Motion.Material3.Spring.Standard.Default.Spatial</item>
278278
<item name="motionSpringDefaultEffects">@style/Motion.Material3.Spring.Standard.Default.Effects</item>
279-
<item name="motionSpringSlowSpacial">@style/Motion.Material3.Spring.Standard.Slow.Spacial</item>
279+
<item name="motionSpringSlowSpatial">@style/Motion.Material3.Spring.Standard.Slow.Spatial</item>
280280
<item name="motionSpringSlowEffects">@style/Motion.Material3.Spring.Standard.Slow.Effects</item>
281281
<item name="motionEasingStandardInterpolator">@interpolator/m3_sys_motion_easing_standard</item>
282282
<item name="motionEasingStandardDecelerateInterpolator">@interpolator/m3_sys_motion_easing_standard_decelerate</item>
@@ -568,11 +568,11 @@
568568
<item name="shapeAppearanceLargeComponent">@style/ShapeAppearance.Material3.LargeComponent</item>
569569

570570
<!-- Motion attributes. -->
571-
<item name="motionSpringFastSpacial">@style/Motion.Material3.Spring.Standard.Fast.Spacial</item>
571+
<item name="motionSpringFastSpatial">@style/Motion.Material3.Spring.Standard.Fast.Spatial</item>
572572
<item name="motionSpringFastEffects">@style/Motion.Material3.Spring.Standard.Fast.Effects</item>
573-
<item name="motionSpringDefaultSpacial">@style/Motion.Material3.Spring.Standard.Default.Spacial</item>
573+
<item name="motionSpringDefaultSpatial">@style/Motion.Material3.Spring.Standard.Default.Spatial</item>
574574
<item name="motionSpringDefaultEffects">@style/Motion.Material3.Spring.Standard.Default.Effects</item>
575-
<item name="motionSpringSlowSpacial">@style/Motion.Material3.Spring.Standard.Slow.Spacial</item>
575+
<item name="motionSpringSlowSpatial">@style/Motion.Material3.Spring.Standard.Slow.Spatial</item>
576576
<item name="motionSpringSlowEffects">@style/Motion.Material3.Spring.Standard.Slow.Effects</item>
577577
<item name="motionEasingStandardInterpolator">@interpolator/m3_sys_motion_easing_standard</item>
578578
<item name="motionEasingStandardDecelerateInterpolator">@interpolator/m3_sys_motion_easing_standard_decelerate</item>

‎lib/javatests/com/google/android/material/motion/MotionUtilsTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void testResolvesThemeSpring() {
6464
float expectedDampingRatio = ResourcesCompat.getFloat(
6565
context.getResources(), R.dimen.m3_sys_motion_standard_spring_fast_spatial_damping);
6666
SpringForce spring =
67-
MotionUtils.resolveThemeSpringForce(context, R.attr.motionSpringFastSpacial);
67+
MotionUtils.resolveThemeSpringForce(context, R.attr.motionSpringFastSpatial);
6868

6969
assertThat(spring.getStiffness()).isEqualTo(expectedStiffness);
7070
assertThat(spring.getDampingRatio()).isEqualTo(expectedDampingRatio);
@@ -77,7 +77,7 @@ public void testPartialSpring_shouldThrow() {
7777

7878
IllegalArgumentException thrown = assertThrows(
7979
IllegalArgumentException.class,
80-
() -> MotionUtils.resolveThemeSpringForce(context, R.attr.motionSpringFastSpacial)
80+
() -> MotionUtils.resolveThemeSpringForce(context, R.attr.motionSpringFastSpatial)
8181
);
8282
assertThat(thrown).hasMessageThat().contains("must have a damping");
8383
}

‎lib/javatests/com/google/android/material/motion/res/values/themes.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<resources>
1818
<!-- A theme with an incorrectly configured custom spring. -->
1919
<style name="Theme.Material3.DayNight.PartialSpring" parent="Theme.Material3.DayNight">
20-
<item name="motionSpringFastSpacial">@style/Motion.MyApp.Spring.Custom.Fast.Spacial</item>
20+
<item name="motionSpringFastSpatial">@style/Motion.MyApp.Spring.Custom.Fast.Spatial</item>
2121
</style>
22-
<style name="Motion.MyApp.Spring.Custom.Fast.Spacial" parent="">
22+
<style name="Motion.MyApp.Spring.Custom.Fast.Spatial" parent="">
2323
<item name="stiffness">1400</item>
2424
</style>
2525

‎lib/javatests/com/google/android/material/theme/ThemeTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -365,11 +365,11 @@ public class ThemeTest {
365365

366366
private static final ImmutableList<Integer> M3_ACTIVE_MOTION_ATTRIBUTES =
367367
ImmutableList.of(
368-
R.attr.motionSpringFastSpacial,
368+
R.attr.motionSpringFastSpatial,
369369
R.attr.motionSpringFastEffects,
370-
R.attr.motionSpringDefaultSpacial,
370+
R.attr.motionSpringDefaultSpatial,
371371
R.attr.motionSpringDefaultEffects,
372-
R.attr.motionSpringSlowSpacial,
372+
R.attr.motionSpringSlowSpatial,
373373
R.attr.motionSpringSlowEffects,
374374
R.attr.motionEasingStandardInterpolator,
375375
R.attr.motionEasingStandardAccelerateInterpolator,

0 commit comments

Comments
 (0)