Skip to content

Commit d942ad5

Browse files
committed
Merge branch 'master' into pehecke-solutions-update
2 parents ac4dc8a + a57a08f commit d942ad5

30 files changed

+195
-159
lines changed

.acrolinx-config.edn

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{:allowed-branchname-matches ["^master$"]
22
:allowed-filename-matches ["powerapps-docs"]
3+
:guidance-profile "dc59e3ef-24fd-46d7-9156-0491aaae6bef" ;; Profile ID for "BAG-specific"
34
:acrolinx-check-settings
45
{
56
"languageId" "en"

powerapps-docs/developer/common-data-service/workflow/workflow-extensions.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ ms.service: powerapps
88
ms.topic: "article"
99
author: "JimDaly" # GitHub ID
1010
ms.author: "jdaly" # MSFT alias of Microsoft employees only
11-
manager: "ryjones" # MSFT alias of manager or PM counterpart
1211
search.audienceType:
1312
- developer
1413
search.app:
@@ -19,7 +18,7 @@ search.app:
1918

2019
You can extend the options available within the designer for workflows used in Common Data Service. These extensions are added by adding an assembly that contains a class the extends the [CodeActivity](/dotnet/api/system.activities.codeactivity) class. These extensions are commonly called *workflow assemblies* or *workflow activities*.
2120

22-
You can use these custom extensions within the designer used for workflows, custom actions, and dialogs.
21+
You can use these custom extensions within the designer used for workflows, custom actions, and dialogs (deprecated).
2322

2423
> [!IMPORTANT]
2524
> Whenever possible, you should first consider applying one of the several declarative options to define business logic. More information: [Apply business logic in Common Data Service](../../../maker/common-data-service/cds-processes.md)

powerapps-docs/index.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ layout: HubPage
33
title: Microsoft Power Apps Documentation | Microsoft Docs
44
description: Microsoft Power Apps Documentation
55
searchScope:
6-
- "PowerApps"
6+
- "Power Platform"
7+
- "Power Apps"
78
featureFlags:
89
- clicktale
910
ms.service: powerapps

powerapps-docs/maker/canvas-apps/controls/control-barcodescanner.md

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,33 @@
11
---
2-
title: 'Web barcode-scanner control: reference | Microsoft Docs'
3-
description: Information, including properties and examples, about the barcode-scanner control
2+
title: 'Web barcode scanner control: reference | Microsoft Docs'
3+
description: Information, including properties and examples, about the web barcode scanner control
44
author: chmoncay
55
manager: kvivek
66
ms.service: powerapps
77
ms.topic: reference
88
ms.custom: canvas
9-
ms.date: 10/25/2016
9+
ms.date: 06/12/2020
1010
ms.author: chmoncay
1111
ms.reviewer: tapanm
1212
search.audienceType:
1313
- maker
1414
search.app:
1515
- PowerApps
1616
---
17-
# Web barcode-scanner control (experimental) in Power Apps
17+
# Web barcode scanner control (experimental) in Power Apps
1818

19-
The legacy barcode-scanning control, which is obsolete but might be useful for scanning codes in a web browser.
19+
The legacy barcode scanning control, which is obsolete but might be useful for scanning codes in a web browser.
2020

2121
## Description
2222

23-
The control shows the camera feed in the app so that users can scan barcodes on all devices. The control is obsolete due to poor performance, and the mobile **[Barcode scanner](control-new-barcode-scanner.md)** control replaces this control.
23+
The control shows the camera feed in the app so that users can scan barcodes on all devices. The control is obsolete because of poor performance, and the mobile **[Barcode scanner](control-new-barcode-scanner.md)** control replaces this control.
24+
25+
> [!NOTE]
26+
> The web barcode scanner control is only supported on Microsoft Edge, Chrome, Firefox, and Opera browsers. All other browsers will show a warning that some features of the app won't work.
2427
2528
## Key properties
2629

27-
**barcode scanner** – On a device that has more than one barcode scanner, the numeric ID of the barcode scanner that the app uses.
30+
**Camera** – On a device that has more than one camera, the numeric ID of the camera that the app uses for scanning barcodes.
2831

2932
## Additional properties
3033

@@ -54,9 +57,9 @@ The control shows the camera feed in the app so that users can scan barcodes on
5457

5558
**[Width](properties-size-___location.md)** – The distance between a control's left and right edges.
5659

57-
**[X](properties-size-___location.md)** – The distance between the left edge of a control and the left edge of its parent container (screen if no parent container).
60+
**[X](properties-size-___location.md)** – The distance between the left edge of a control and the left edge of its parent container (screen, if no parent container).
5861

59-
**[Y](properties-size-___location.md)** – The distance between the top edge of a control and the top edge of the parent container (screen if no parent container).
62+
**[Y](properties-size-___location.md)** – The distance between the top edge of a control and the top edge of the parent container (screen, if no parent container).
6063

6164
## Related functions
6265

@@ -80,7 +83,7 @@ The control shows the camera feed in the app so that users can scan barcodes on
8083

8184
### Video alternatives
8285

83-
* Consider adding a **[Label](control-text-box.md)** with its **[Text](properties-core.md)** set to the barcode scanner's **Text**. Since the barcode scanner does not display the identified barcode value, doing the above makes the scanner accessible to everyone, not just those with visual disabilities.
86+
* Consider adding a **[Label](control-text-box.md)** with its **[Text](properties-core.md)** set to the barcode scanner's **Text**. Since the barcode scanner doesn't display the identified barcode value, doing the above makes the scanner accessible to everyone, not just those with visual disabilities.
8487

8588
### Screen reader support
8689

powerapps-docs/maker/canvas-apps/controls/control-camera.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ manager: kvivek
66
ms.service: powerapps
77
ms.topic: reference
88
ms.custom: canvas
9-
ms.date: 04/07/2020
9+
ms.date: 06/12/2020
1010
ms.author: chmoncay
1111
ms.reviewer: tapanm
1212
search.audienceType:
@@ -21,7 +21,7 @@ A control that enables users to take pictures using the camera on a device.
2121

2222
## Description
2323

24-
Use the **Camera** control to capture pictures with a device's camera. The device must have a camera and the user must authorize the app to use the camera. The camera control is supported when running in a web browser.
24+
Use the **Camera** control to capture pictures with a device's camera. The device must have a camera and the user must authorize the app to use the camera.
2525

2626
The most recently captured picture is available through the **Photo** property. With this property, the images can be:
2727

@@ -36,6 +36,9 @@ Captured media is referenced by a text string URI. For more information, read th
3636

3737
Images generated by the camera control aren't usually in the full resolution of the camera. If you need full resolution images, use the [Add picture](control-add-picture.md) control.
3838

39+
> [!NOTE]
40+
> The camera control is only supported on Microsoft Edge, Chrome, Firefox, and Opera browsers; and Android and iOS devices. All other browsers and platforms will show a warning that some features of the app won't work.
41+
3942
## Key properties
4043

4144
**AvailableDevices** – Table of the available cameras on the device.
@@ -168,7 +171,7 @@ Use the [SaveData](../functions/function-savedata-loaddata.md) function to save
168171
169172
1. [Add](../add-configure-controls.md) a [Drop down](control-drop-down.md) control.
170173
171-
1. Set the **Items** prroperty of the dropdown to:
174+
1. Set the **Items** property of the dropdown to:
172175
173176
```powerapps-dot
174177
Camera1.AvailableDevices

powerapps-docs/maker/canvas-apps/controls/control-microphone.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.service: powerapps
77
ms.topic: reference
88
ms.custom: canvas
99
ms.reviewer: tapanm
10-
ms.date: 03/16/2020
10+
ms.date: 06/12/2020
1111
ms.author: chmoncay
1212
search.audienceType:
1313
- maker
@@ -20,7 +20,7 @@ A control that enables app users to record sounds from their device.
2020

2121
## Description
2222

23-
Use the **Microphone** control to capture audio with a device's microphone. The device must have a microphone and the user must authorize the app to use the microphone. The microphone control is supported when running in a web browser.
23+
Use the **Microphone** control to capture audio with a device's microphone. The device must have a microphone and the user must authorize the app to use the microphone.
2424

2525
The most recently recorded audio clip is available through the **Audio** property. With this property, recorded audio can be:
2626

@@ -37,6 +37,9 @@ Format of the recorded audio:
3737

3838
Captured media is referenced by a text string URI. For more information, read the [data type documentation](../functions/data-types.md#uris-for-images-and-other-media).
3939

40+
> [!NOTE]
41+
> The microphone control is supported only on Microsoft Edge based on Chromium, Chrome, and Firefox browsers; and Android and iOS devices. All other browsers and platforms will show a warning that some features of the app won't work.
42+
4043
## Key properties
4144

4245
**Audio** – The audio clip captured when the user records with the device's microphone.

powerapps-docs/maker/canvas-apps/controls/control-new-barcode-scanner.md

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
11
---
2-
title: 'Barcode-scanner control: reference | Microsoft Docs'
3-
description: Information, including properties and examples, about the barcode-scanner control
2+
title: 'Barcode scanner control: reference | Microsoft Docs'
3+
description: Information, including properties and examples, about the barcode scanner control
44
author: chmoncay
55
manager: kvivek
66
ms.service: powerapps
77
ms.topic: reference
88
ms.custom: canvas
9-
ms.date: 11/25/2018
9+
ms.date: 06/12/2020
1010
ms.author: chmoncay
1111
ms.reviewer: tapanm
1212
search.audienceType:
1313
- maker
1414
search.app:
1515
- PowerApps
1616
---
17-
# Barcode-scanner control for canvas apps
17+
# Barcode scanner control for canvas apps
1818

19-
Scans barcodes, QR codes, and data-matrix codes on an Android or iOS device. Not supported in a web browser.
19+
Scans barcodes, QR codes, and data-matrix codes on an Android or iOS device.
2020

2121
## Description
2222

2323
The control opens a native scanner on an Android or iOS device. The scanner automatically detects a barcode, a QR code, or a data-matrix code when in view. The control doesn't support scanning in a web browser.
2424

25+
> [!NOTE]
26+
> The barcode scanner control is only supported on Android and iOS devices. All other platforms will show a warning that some features of the app won't work.
27+
2528
## Key properties
2629

2730
**Value** – Output property that contains the text value of the code that was scanned most recently.
@@ -30,7 +33,7 @@ The control opens a native scanner on an Android or iOS device. The scanner auto
3033

3134
**OnScan** – How an app responds when a barcode is successfully scanned.
3235

33-
**OnCancel** – How an app responds when a barcode scan is cancelled by the user.
36+
**OnCancel** – How an app responds when a barcode scan is canceled by the user.
3437

3538
**BarcodeType** - The barcode type to scan. You can target multiple barcode types by concatenating them. Ex. BarcodeType.Code128 & BarcodeType.Code39 **Default: Auto**
3639

@@ -60,15 +63,15 @@ The control opens a native scanner on an Android or iOS device. The scanner auto
6063

6164
**[Width](properties-size-___location.md)** – The width of the button that activates the scanner.
6265

63-
**[X](properties-size-___location.md)** – The distance between the left edge of a control and the left edge of its parent container (screen if no parent container).
66+
**[X](properties-size-___location.md)** – The distance between the left edge of a control and the left edge of its parent container (screen, if no parent container).
6467

65-
**[Y](properties-size-___location.md)** – The distance between the top edge of a control and the top edge of the parent container (screen if no parent container).
68+
**[Y](properties-size-___location.md)** – The distance between the top edge of a control and the top edge of the parent container (screen, if no parent container).
6669

6770
## Accessibility guidelines
6871
The same guidelines for the **[Button](control-button.md)** control apply to the **Barcode scanner** control because it's a button that launches the scan.
6972

7073
### Visual alternatives
71-
* The barcode scanner is a button that doesn't display the scan result. Consider showing the scan result with a **[Label](control-text-box.md)** control. Set the label's **[Text](properties-core.md)** property to the barcode scanner's **Value** property. Set the label's **[Live](properties-accessibility.md)** property to **Polite** so that screen-reader users are notified of changes. This change makes the scanned value accessible to everyone, regardless of visual ability.
74+
* The barcode scanner is a button that doesn't display the scan result. Consider showing the scan result with a **[Label](control-text-box.md)** control. Set the label's **[Text](properties-core.md)** property to the barcode scanner's **Value** property. Set the label's **[Live](properties-accessibility.md)** property to **Polite** so that screen-reader users are notified of changes. This change makes the scanned value accessible to everyone, irrespective of visual ability.
7275

7376
* Users who have visual and motor disabilities might prefer not to point the camera at a barcode. Consider adding another form of input, such as a **[Text input](control-text-input.md)** control, for users to enter barcodes.
7477

@@ -93,4 +96,4 @@ The same guidelines for the **[Button](control-button.md)** control apply to the
9396
|MSI|||
9497
|AZTEC|||
9598

96-
**NOTE:** PDF_417 and AZTEC are not supported in Auto mode
99+
**NOTE:** PDF_417 and AZTEC aren't supported in Auto mode

0 commit comments

Comments
 (0)