Skip to content

Commit 68cc447

Browse files
committed
Merged main into live
2 parents 4da6305 + 0b21128 commit 68cc447

File tree

71 files changed

+1132
-1287
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1132
-1287
lines changed

.openpublishing.redirection.json

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8084,6 +8084,76 @@
80848084
"source_path": "hub/apps/publish/publish-your-app/pwa/overview.md",
80858085
"redirect_url": "/windows/apps/publish/",
80868086
"redirect_document_id": false
8087+
},
8088+
{
8089+
"source_path": "hub/apps/design/shell/tiles-and-notifications/adaptive-tiles-schema.md",
8090+
"redirect_url": "/windows/uwp/launch-resume/adaptive-tiles-schema",
8091+
"redirect_document_id": false
8092+
},
8093+
{
8094+
"source_path": "hub/apps/design/shell/tiles-and-notifications/chaseable-tile-notifications.md",
8095+
"redirect_url": "/windows/uwp/launch-resume/chaseable-tile-notifications",
8096+
"redirect_document_id": false
8097+
},
8098+
{
8099+
"source_path": "hub/apps/design/shell/tiles-and-notifications/create-adaptive-tiles.md",
8100+
"redirect_url": "/windows/uwp/launch-resume/create-adaptive-tiles",
8101+
"redirect_document_id": false
8102+
},
8103+
{
8104+
"source_path": "hub/apps/design/shell/tiles-and-notifications/creating-tiles.md",
8105+
"redirect_url": "/windows/uwp/launch-resume/creating-tiles",
8106+
"redirect_document_id": false
8107+
},
8108+
{
8109+
"source_path": "hub/apps/design/shell/tiles-and-notifications/primary-tile-apis.md",
8110+
"redirect_url": "/windows/uwp/launch-resume/primary-tile-apis",
8111+
"redirect_document_id": false
8112+
},
8113+
{
8114+
"source_path": "hub/apps/design/shell/tiles-and-notifications/secondary-tiles-guidance.md",
8115+
"redirect_url": "/windows/uwp/launch-resume/secondary-tiles-guidance",
8116+
"redirect_document_id": false
8117+
},
8118+
{
8119+
"source_path": "hub/apps/design/shell/tiles-and-notifications/secondary-tiles-pin-to-taskbar.md",
8120+
"redirect_url": "/windows/uwp/launch-resume/secondary-tiles-pin-to-taskbar",
8121+
"redirect_document_id": false
8122+
},
8123+
{
8124+
"source_path": "hub/apps/design/shell/tiles-and-notifications/secondary-tiles-pinning.md",
8125+
"redirect_url": "/windows/uwp/launch-resume/secondary-tiles-pinning",
8126+
"redirect_document_id": false
8127+
},
8128+
{
8129+
"source_path": "hub/apps/design/shell/tiles-and-notifications/secondary-tiles.md",
8130+
"redirect_url": "/windows/uwp/launch-resume/secondary-tiles",
8131+
"redirect_document_id": false
8132+
},
8133+
{
8134+
"source_path": "hub/apps/design/shell/tiles-and-notifications/sending-a-local-tile-notification.md",
8135+
"redirect_url": "/windows/uwp/launch-resume/sending-a-local-tile-notification",
8136+
"redirect_document_id": false
8137+
},
8138+
{
8139+
"source_path": "hub/apps/design/shell/tiles-and-notifications/special-tile-templates-catalog.md",
8140+
"redirect_url": "/windows/uwp/launch-resume/special-tile-templates-catalog",
8141+
"redirect_document_id": false
8142+
},
8143+
{
8144+
"source_path": "hub/apps/design/shell/tiles-and-notifications/tile-schema.md",
8145+
"redirect_url": "/windows/uwp/launch-resume/tile-schema",
8146+
"redirect_document_id": false
8147+
},
8148+
{
8149+
"source_path": "hub/apps/design/shell/tiles-and-notifications/tile-toast-language-scale-contrast.md",
8150+
"redirect_url": "/windows/uwp/launch-resume/tile-toast-language-scale-contrast",
8151+
"redirect_document_id": false
8152+
},
8153+
{
8154+
"source_path": "hub/apps/design/shell/tiles-and-notifications/index.md",
8155+
"redirect_url": "/windows/uwp/launch-resume/creating-tiles",
8156+
"redirect_document_id": false
80878157
}
80888158
]
80898159
}

hub/apps/design/shell/index.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,5 @@ Ask your user to pin your app to the taskbar to make it easier to find.
3838
Extend your app content into the title bar and add custom content.
3939
:::column-end:::
4040
:::column:::
41-
### [Start menu icon](tiles-and-notifications/creating-tiles.md)
42-
Every app is represented in the Start Menu by an icon. You can also pin secondary icons to provide direct access to specific content.
4341
:::column-end:::
4442
:::row-end:::

hub/apps/design/shell/pin-to-taskbar.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.localizationpriority: medium
99
---
1010
# Pin your app to the taskbar
1111

12-
Now you can programmatically request users to pin your Win32 or UWP app to the taskbar, similar to how you can [pin your app to the Start menu](tiles-and-notifications/primary-tile-apis.md). And you can check whether your app is currently pinned, and whether the taskbar allows pinning.
12+
Now you can programmatically request users to pin your Win32 or UWP app to the taskbar, similar to how you can [pin your app to the Start menu](/windows/uwp/launch-resume/primary-tile-apis). And you can check whether your app is currently pinned, and whether the taskbar allows pinning.
1313

1414
![Screenshot of a Windows 11 task bar showing the app pinned there.](images/taskbar/taskbar.png)
1515

@@ -132,4 +132,4 @@ This method returns a boolean value that indicates whether your app is now pinne
132132
* [Full UWP code sample on GitHub](https://github.com/WindowsNotifications/quickstart-pin-to-taskbar)
133133
* [Full desktop code sample on GitHub](https://github.com/microsoft/Windows-classic-samples/tree/main/Samples/TaskbarManager)
134134
* [TaskbarManager class](/uwp/api/windows.ui.shell.taskbarmanager)
135-
* [Pin an app to the Start menu](tiles-and-notifications/primary-tile-apis.md)
135+
* [Pin an app to the Start menu](/windows/uwp/launch-resume/primary-tile-apis)

hub/apps/design/shell/tiles-and-notifications/adaptive-interactive-toasts.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ To learn more about using headers, please see [Toast headers](toast-headers.md).
431431

432432
**New in Anniversary Update**: In addition to the content specified above, you can also display additional adaptive content that is visible when the toast is expanded.
433433

434-
This additional content is specified using Adaptive, which you can learn more about by reading the [Adaptive Tiles documentation](create-adaptive-tiles.md).
434+
This additional content is specified using Adaptive, which you can learn more about by reading the [Adaptive Tiles documentation](/windows/uwp/launch-resume/create-adaptive-tiles).
435435

436436
Note that any adaptive content must be contained within an [**AdaptiveGroup**](./toast-schema.md#adaptivegroup). Otherwise it will not be rendered using adaptive.
437437

@@ -592,7 +592,7 @@ var builder = new ToastContentBuilder()
592592
You can add icons to your buttons. These icons are white transparent 16x16 pixel images at 100% scaling, and should have no padding included in the image itself. If you choose to provide icons on a toast notification, you must provide icons for ALL of your buttons in the notification, as it transforms the style of your buttons into icon buttons.
593593

594594
> [!NOTE]
595-
> For accessibility, be sure to include a contrast-white version of the icon (a black icon for white backgrounds), so that when the user turns on High Contrast White mode, your icon is visible. For more information, see [Tile and toast notification support for language, scale, and high contrast](tile-toast-language-scale-contrast.md).
595+
> For accessibility, be sure to include a contrast-white version of the icon (a black icon for white backgrounds), so that when the user turns on High Contrast White mode, your icon is visible. For more information, see [Tile and toast notification support for language, scale, and high contrast](/windows/uwp/launch-resume/tile-toast-language-scale-contrast).
596596
597597
![Screenshot of an app notification that uses buttons with icons.](images/toast-content-button-icons.png)
598598

@@ -1429,7 +1429,7 @@ if (AppNotificationBuilder.IsUrgentScenarioSupported())
14291429

14301430
## Localization and accessibility
14311431

1432-
Your tiles and app notifications can load strings and images tailored for display language, display scale factor, high contrast, and other runtime contexts. For more info, see [Tile and toast notification support for language, scale, and high contrast](tile-toast-language-scale-contrast.md).
1432+
Your tiles and app notifications can load strings and images tailored for display language, display scale factor, high contrast, and other runtime contexts. For more info, see [Tile and toast notification support for language, scale, and high contrast](/windows/uwp/launch-resume/tile-toast-language-scale-contrast).
14331433

14341434

14351435
## Handling activation
@@ -1439,4 +1439,4 @@ To learn how to handle app activations (the user clicking your toast or buttons
14391439

14401440
* [Send a local toast and handle activation](send-local-toast.md)
14411441
* [Notifications library on GitHub (part of the UWP Community Toolkit)](https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.Notifications)
1442-
* [Tile and toast notification support for language, scale, and high contrast](tile-toast-language-scale-contrast.md)
1442+
* [Tile and toast notification support for language, scale, and high contrast](/windows/uwp/launch-resume/tile-toast-language-scale-contrast)

hub/apps/design/shell/tiles-and-notifications/badges.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@ ms.localizationpriority: medium
1111
---
1212
# Badge notifications for Windows apps
1313

14-
15-
16-
<div>
17-
<img src="images/badge-example.png" alt="A tile with a numeric badge displaying the number 63 to indicate 63 unread mails." /><br/>A tile with a numeric badge displaying<br/> the number 63 to indicate 63 unread mails.</div>
18-
1914
A notification badge conveys summary or status information specific to your app. They can be numeric (1-99) or one of a set of system-provided glyphs. Examples of information best conveyed through a badge include network connection status in an online game, user status in a messaging app, number of unread mails in a mail app, and number of new posts in a social media app.
2015

2116
Notification badges appear on your app's taskbar icon and in the lower-right corner of its start tile, regardless of whether the app is running. Badges can be displayed on all tile sizes.
@@ -125,5 +120,5 @@ private void clearBadge()
125120
## Related articles
126121

127122
* [Adaptive and interactive toast notifications](adaptive-interactive-toasts.md)
128-
* [Create tiles](creating-tiles.md)
129-
* [Create adaptive tiles](create-adaptive-tiles.md)
123+
* [Create tiles](/windows/uwp/launch-resume/creating-tiles)
124+
* [Create adaptive tiles](/windows/uwp/launch-resume/create-adaptive-tiles)

hub/apps/design/shell/tiles-and-notifications/channel-types.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ In general, we recommend using the primary channel in your app, with a few excep
163163

164164
## Related articles
165165

166-
* [Send a local tile notification](../tiles-and-notifications/sending-a-local-tile-notification.md)
166+
* [Send a local tile notification](/windows/uwp/launch-resume/sending-a-local-tile-notification)
167167
* [Adaptive and interactive toast notifications](../tiles-and-notifications/adaptive-interactive-toasts.md)
168168
* [Quickstart: Sending a push notification](/previous-versions/windows/apps/hh868252(v=win.10))
169169
* [How to update a badge through push notifications](/previous-versions/windows/apps/hh465450(v=win.10))

hub/apps/design/shell/tiles-and-notifications/choosing-a-notification-delivery-method.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ By default, local toast notifications expire in three days, and local tile notif
104104

105105
For more information, see these topics:
106106

107-
- [Send a local tile notification](sending-a-local-tile-notification.md)
107+
- [Send a local tile notification](/windows/uwp/launch-resume/sending-a-local-tile-notification)
108108
- [Send a local toast notification](send-local-toast.md)
109109
- [Windows app notifications code samples](https://github.com/Microsoft/Windows-universal-samples/tree/master/Samples/Notifications)
110110

@@ -155,7 +155,7 @@ For more information, see:
155155
## Related topics
156156

157157

158-
* [Send a local tile notification](sending-a-local-tile-notification.md)
158+
* [Send a local tile notification](/windows/uwp/launch-resume/sending-a-local-tile-notification)
159159
* [Send a local toast notification](send-local-toast.md)
160160
* [Guidelines for push notifications](./windows-push-notification-services--wns--overview.md)
161161
* [Guidelines for toast notifications](./index.md)

hub/apps/design/shell/tiles-and-notifications/index.md

Lines changed: 0 additions & 53 deletions
This file was deleted.

hub/apps/design/shell/tiles-and-notifications/periodic-notification-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Note that periodic updates cannot be used with toast notifications. Toast is bes
3535

3636
Any valid HTTP or HTTPS web address can be used as the URI to be polled.
3737

38-
The cloud server's response includes the downloaded content. The content returned from the URI must conform to the [Tile](adaptive-tiles-schema.md) or [Badge](/uwp/schemas/tiles/badgeschema/schema-root) XML schema specification, and must be UTF-8 encoded. You can use defined HTTP headers to specify the [expiration time](#expiration-of-tile-and-badge-notifications) or tag for the notification.
38+
The cloud server's response includes the downloaded content. The content returned from the URI must conform to the [Tile](/uwp/schemas/tiles/tilesschema/schema-root) or [Badge](/uwp/schemas/tiles/badgeschema/schema-root) XML schema specification, and must be UTF-8 encoded. You can use defined HTTP headers to specify the [expiration time](#expiration-of-tile-and-badge-notifications) or tag for the notification.
3939

4040
## Polling Behavior
4141

0 commit comments

Comments
 (0)