mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-05 18:57:19 +02:00
Add telemetry for shortcut conflict detection feature. (#41271)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> ## Summary of the Pull Request Add telemetry for shortcut conflict detection. <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [ ] Closes: #xxx - [ ] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [ ] **Tests:** Added/updated and all pass - [ ] **Localization:** All end-user-facing strings can be localized - [ ] **Dev docs:** Added/updated - [ ] **New binaries:** Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [ ] **Documentation updated:** If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: #xxx <!-- Provide a more detailed description of the PR, other things fixed, or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed --------- Signed-off-by: Shawn Yuan <shuaiyuan@microsoft.com> Signed-off-by: Shuai Yuan <shuai.yuan.zju@gmail.com>
This commit is contained in:
@@ -7,7 +7,9 @@ using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
using System.Linq;
|
||||
using Microsoft.PowerToys.Settings.UI.Library.HotkeyConflicts;
|
||||
using Microsoft.PowerToys.Settings.UI.Library.Telemetry.Events;
|
||||
using Microsoft.PowerToys.Settings.UI.SettingsXAML.Controls.Dashboard;
|
||||
using Microsoft.PowerToys.Telemetry;
|
||||
using Microsoft.UI.Xaml;
|
||||
using Microsoft.UI.Xaml.Controls;
|
||||
using Microsoft.Windows.ApplicationModel.Resources;
|
||||
@@ -18,6 +20,8 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
|
||||
{
|
||||
private static readonly ResourceLoader ResourceLoader = Helpers.ResourceLoaderInstance.ResourceLoader;
|
||||
|
||||
private static bool _telemetryEventSent;
|
||||
|
||||
public static readonly DependencyProperty AllHotkeyConflictsDataProperty =
|
||||
DependencyProperty.Register(
|
||||
nameof(AllHotkeyConflictsData),
|
||||
@@ -92,6 +96,17 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
|
||||
|
||||
// Update visibility based on conflict count
|
||||
Visibility = HasConflicts ? Visibility.Visible : Visibility.Collapsed;
|
||||
|
||||
if (!_telemetryEventSent && HasConflicts)
|
||||
{
|
||||
// Log telemetry event when conflicts are detected
|
||||
PowerToysTelemetry.Log.WriteEvent(new ShortcutConflictDetectedEvent()
|
||||
{
|
||||
ConflictCount = ConflictCount,
|
||||
});
|
||||
|
||||
_telemetryEventSent = true;
|
||||
}
|
||||
}
|
||||
|
||||
private void OnPropertyChanged(string propertyName)
|
||||
@@ -115,6 +130,12 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
|
||||
return;
|
||||
}
|
||||
|
||||
// Log telemetry event when user clicks the shortcut conflict button
|
||||
PowerToysTelemetry.Log.WriteEvent(new ShortcutConflictControlClickedEvent()
|
||||
{
|
||||
ConflictCount = this.ConflictCount,
|
||||
});
|
||||
|
||||
// Create and show the new window instead of dialog
|
||||
var conflictWindow = new ShortcutConflictWindow();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user