Merge branch 'main' into patch-1

dotnet · Jan 13, 2025 · 75c80dc · 75c80dc
2 parents 150aadf + b822934
commit 75c80dc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/docs/platform-integration/customize-ui-appearance.md b/docs/platform-integration/customize-ui-appearance.md
@@ -88,7 +88,7 @@ The <xref:Microsoft.Maui.Controls.OnIdiom`1> class enables you to customize UI a
             <OnIdiom.Phone>0,20,0,0</OnIdiom.Phone>
             <OnIdiom.Tablet>0,40,0,0</OnIdiom.Tablet>
             <OnIdiom.Desktop>0,60,0,0</OnIdiom.Desktop>
-        </OnPlatform>
+        </OnIdiom>
     </ContentPage.Margin>
     ...
 </ContentPage>
@@ -103,7 +103,7 @@ The <xref:Microsoft.Maui.Controls.OnIdiom`1> class enables you to customize UI a
     <ContentPage.Margin>
         <OnIdiom x:TypeArguments="Thickness" Default="20">
             <OnIdiom.Desktop>0,60,0,0</OnIdiom.Desktop>
-        </OnPlatform>
+        </OnIdiom>
     </ContentPage.Margin>
     ...
 </ContentPage>

diff --git a/docs/user-interface/animation/basic.md b/docs/user-interface/animation/basic.md
@@ -180,7 +180,7 @@ In this example, the `Task.WhenAll` method contains three tasks, each of which e
 
 ## Canceling animations
 
-An app can cancel one or more animations with a call to the <xref:Microsoft.Maui.Controls.ViewExtensions.CancelAnimations%2A> extension method:
+The <xref:Microsoft.Maui.Controls.ViewExtensions.CancelAnimations%2A> extension method is used to cancel any animations, such as rotation, scaling, translation, and fading, that are running on a specific <xref:Microsoft.Maui.Controls.VisualElement>.
 
 ```csharp
 image.CancelAnimations();

diff --git a/docs/user-interface/handlers/index.md b/docs/user-interface/handlers/index.md
@@ -1,12 +1,12 @@
 ---
 title: ".NET MAUI handlers"
 description: "Learn about .NET MAUI handlers, which map cross-platform controls to performant native controls on each platform."
-ms.date: 01/17/2024
+ms.date: 01/13/2025
 ---
 
 # Handlers
 
-.NET Multi-platform App UI (.NET MAUI) provides a collection of cross-platform controls that can be used to display data, initiate actions, indicate activity, display collections, pick data, and more. Each control has an interface representation that abstracts the control. Cross-platform controls that implement these interfaces are known as *virtual views*. *Handlers* map these virtual views to controls on each platform, which are known as *native views*. Handlers are also responsible for instantiating the underlying native view, and mapping the cross-platform control API to the native view API. For example, on iOS a handler maps a .NET MAUI <xref:Microsoft.Maui.Controls.Button> to an iOS `UIButton`. On Android, the <xref:Microsoft.Maui.Controls.Button> is mapped to an `AppCompatButton`:
+.NET Multi-platform App UI (.NET MAUI) provides a collection of cross-platform controls that can be used to display data, initiate actions, indicate activity, display collections, pick data, and more. Each control has an interface representation that abstracts the control. Cross-platform controls that implement these interfaces are known as *virtual views*. *Handlers* map these virtual views to controls on each platform, which are known as *native views*. Handlers are also responsible for instantiating the underlying native view, and mapping the cross-platform control API to the native view API. For example, on iOS a handler maps a .NET MAUI <xref:Microsoft.Maui.Controls.Button> to an iOS `UIButton`. On Android, the <xref:Microsoft.Maui.Controls.Button> is mapped to a `MaterialButton`:
 
 :::image type="content" source="media/overview/button-handler.png" alt-text="Button handler architecture." border="false":::
 

diff --git a/docs/user-interface/handlers/media/overview/button-handler.png b/docs/user-interface/handlers/media/overview/button-handler.png