Skip to content

Commit 35b062b

Browse files
yaira2yaira2
committed
Revert "Test"
This reverts commit 8e88baa.
1 parent 8e88baa commit 35b062b

File tree

9 files changed

+21
-42
lines changed

9 files changed

+21
-42
lines changed

‎src/Files.App/Views/Settings/AboutPage.xaml‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050

5151
<!-- GitHub Sponsor -->
5252
<wctcontrols:SettingsCard
53-
AutomationProperties.AccessibilityView="Raw"
5453
Command="{x:Bind ViewModel.SupportUsCommand}"
5554
Header="{helpers:ResourceString Name=SponsorUsOnGitHub}"
5655
IsClickEnabled="True">
@@ -74,7 +73,6 @@
7473
<!-- Documentation -->
7574
<wctcontrols:SettingsCard
7675
HorizontalAlignment="Stretch"
77-
AutomationProperties.AccessibilityView="Raw"
7876
Command="{x:Bind ViewModel.OpenDocumentationCommand}"
7977
Header="{helpers:ResourceString Name=Documentation}"
8078
IsClickEnabled="True">
@@ -90,7 +88,6 @@
9088
<!-- Questions & discussions -->
9189
<wctcontrols:SettingsCard
9290
HorizontalAlignment="Stretch"
93-
AutomationProperties.AccessibilityView="Raw"
9491
Command="{x:Bind ViewModel.OpenDiscordCommand}"
9592
Header="{helpers:ResourceString Name=QuestionsAndDiscussions}"
9693
IsClickEnabled="True">
@@ -104,15 +101,14 @@
104101
</wctcontrols:SettingsCard>
105102

106103
<!-- Feedback -->
107-
<wctcontrols:SettingsExpander AutomationProperties.AutomationControlType="Custom" Header="{helpers:ResourceString Name=Feedback}">
104+
<wctcontrols:SettingsExpander HorizontalAlignment="Stretch" Header="{helpers:ResourceString Name=Feedback}">
108105
<wctcontrols:SettingsExpander.HeaderIcon>
109106
<FontIcon Glyph="&#xED15;" />
110107
</wctcontrols:SettingsExpander.HeaderIcon>
111108
<wctcontrols:SettingsExpander.Items>
112109
<!-- Submit feature request -->
113110
<wctcontrols:SettingsCard
114111
HorizontalAlignment="Stretch"
115-
AutomationProperties.AccessibilityView="Raw"
116112
Command="{x:Bind ViewModel.SubmitFeatureRequestCommand}"
117113
Header="{helpers:ResourceString Name=SubmitFeatureRequest}"
118114
IsClickEnabled="True">
@@ -124,7 +120,6 @@
124120
<!-- Submit bug report -->
125121
<wctcontrols:SettingsCard
126122
HorizontalAlignment="Stretch"
127-
AutomationProperties.AccessibilityView="Raw"
128123
Command="{x:Bind ViewModel.SubmitBugReportCommand}"
129124
Header="{helpers:ResourceString Name=SubmitBugReport}"
130125
IsClickEnabled="True">
@@ -138,7 +133,6 @@
138133
<!-- Open Log File Location -->
139134
<wctcontrols:SettingsCard
140135
HorizontalAlignment="Stretch"
141-
AutomationProperties.AccessibilityView="Raw"
142136
Command="{x:Bind ViewModel.OpenLogLocationCommand}"
143137
Header="{helpers:ResourceString Name=OpenLogLocation}"
144138
IsClickEnabled="True">
@@ -162,7 +156,6 @@
162156
<!-- Translate -->
163157
<wctcontrols:SettingsCard
164158
HorizontalAlignment="Stretch"
165-
AutomationProperties.AccessibilityView="Raw"
166159
Command="{x:Bind ViewModel.OpenCrowdinCommand}"
167160
Header="{helpers:ResourceString Name=ImproveTranslation}"
168161
IsClickEnabled="True">
@@ -176,7 +169,7 @@
176169
</wctcontrols:SettingsCard>
177170

178171
<!-- Third Party Licenses -->
179-
<wctcontrols:SettingsExpander AutomationProperties.AutomationControlType="Custom" Header="{helpers:ResourceString Name=ThirdPartyLibraries}">
172+
<wctcontrols:SettingsExpander Header="{helpers:ResourceString Name=ThirdPartyLibraries}">
180173
<wctcontrols:SettingsExpander.HeaderIcon>
181174
<FontIcon Glyph="&#xE90F;" />
182175
</wctcontrols:SettingsExpander.HeaderIcon>
@@ -209,7 +202,6 @@
209202
<!-- Open GitHub repo -->
210203
<wctcontrols:SettingsCard
211204
HorizontalAlignment="Stretch"
212-
AutomationProperties.AccessibilityView="Raw"
213205
Command="{x:Bind ViewModel.OpenGitHubRepoCommand}"
214206
Header="{helpers:ResourceString Name=OpenGitHubRepo}"
215207
IsClickEnabled="True">
@@ -225,7 +217,6 @@
225217
<!-- Privacy -->
226218
<wctcontrols:SettingsCard
227219
HorizontalAlignment="Stretch"
228-
AutomationProperties.AccessibilityView="Raw"
229220
Command="{x:Bind ViewModel.OpenPrivacyPolicyCommand}"
230221
Header="{helpers:ResourceString Name=Privacy}"
231222
IsClickEnabled="True">

‎src/Files.App/Views/Settings/AdvancedPage.xaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737

3838
<!-- Export -->
3939
<wctcontrols:SettingsCard
40-
AutomationProperties.AccessibilityView="Raw"
4140
Command="{x:Bind ViewModel.ExportSettingsCommand}"
4241
Header="{helpers:ResourceString Name=ExportSettings}"
4342
IsClickEnabled="True">
@@ -51,7 +50,6 @@
5150

5251
<!-- Import -->
5352
<wctcontrols:SettingsCard
54-
AutomationProperties.AccessibilityView="Raw"
5553
Command="{x:Bind ViewModel.ImportSettingsCommand}"
5654
Header="{helpers:ResourceString Name=ImportSettings}"
5755
IsClickEnabled="True">
@@ -65,7 +63,6 @@
6563

6664
<!-- Edit Settings File -->
6765
<wctcontrols:SettingsCard
68-
AutomationProperties.AccessibilityView="Raw"
6966
Command="{x:Bind ViewModel.OpenSettingsJsonCommand}"
7067
Header="{helpers:ResourceString Name=EditSettingsFile}"
7168
IsClickEnabled="True">
@@ -134,7 +131,6 @@
134131
<wctcontrols:SettingsCard
135132
x:Name="SetAsDefaultSettingsBlockControl"
136133
HorizontalAlignment="Stretch"
137-
AutomationProperties.AutomationControlType="Custom"
138134
Description="{helpers:ResourceString Name=SettingsSetAsDefaultFileManagerDescription}"
139135
Header="{helpers:ResourceString Name=SettingsSetAsDefaultFileManager}">
140136
<wctcontrols:SettingsCard.HeaderIcon>

‎src/Files.App/Views/Settings/AppearancePage.xaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@
120120
<!-- App Background -->
121121
<wctcontrols:SettingsExpander
122122
HorizontalAlignment="Stretch"
123-
AutomationProperties.AutomationControlType="Custom"
124123
Header="{helpers:ResourceString Name=BackgroundColor}"
125124
IsExpanded="True">
126125
<wctcontrols:SettingsExpander.HeaderIcon>
@@ -166,7 +165,6 @@
166165
<!-- App Background Image -->
167166
<wctcontrols:SettingsExpander
168167
HorizontalAlignment="Stretch"
169-
AutomationProperties.AutomationControlType="Custom"
170168
Description="{x:Bind ViewModel.AppThemeBackgroundImageSource, Mode=OneWay}"
171169
Header="{helpers:ResourceString Name=BackgroundImage}"
172170
IsExpanded="False">
@@ -245,7 +243,7 @@
245243
</wctcontrols:SettingsCard>
246244

247245
<!-- Toolbar -->
248-
<wctcontrols:SettingsExpander AutomationProperties.AutomationControlType="Custom" Header="{helpers:ResourceString Name=Toolbars}">
246+
<wctcontrols:SettingsExpander Header="{helpers:ResourceString Name=Toolbars}">
249247
<wctcontrols:SettingsExpander.HeaderIcon>
250248
<PathIcon Data="{StaticResource App.Theme.PathIcon.WebAsset}" />
251249
</wctcontrols:SettingsExpander.HeaderIcon>

‎src/Files.App/Views/Settings/DevToolsPage.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
Text="{helpers:ResourceString Name=DevTools}" />
4747

4848
<!-- Display Open IDE status bar button -->
49-
<wctcontrols:SettingsExpander AutomationProperties.AutomationControlType="Custom" Header="{helpers:ResourceString Name=DisplayOpenIDE}">
49+
<wctcontrols:SettingsExpander Header="{helpers:ResourceString Name=DisplayOpenIDE}">
5050
<wctcontrols:SettingsExpander.HeaderIcon>
5151
<FontIcon Glyph="&#xE7AC;" />
5252
</wctcontrols:SettingsExpander.HeaderIcon>

‎src/Files.App/Views/Settings/FoldersPage.xaml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
Text="{helpers:ResourceString Name=Display}" />
3737

3838
<!-- Hidden Items -->
39-
<wctcontrols:SettingsExpander AutomationProperties.AutomationControlType="Custom" Header="{helpers:ResourceString Name=HiddenItems}">
39+
<wctcontrols:SettingsExpander Header="{helpers:ResourceString Name=HiddenItems}">
4040
<wctcontrols:SettingsExpander.HeaderIcon>
4141
<FontIcon Glyph="&#xED1A;" />
4242
</wctcontrols:SettingsExpander.HeaderIcon>
@@ -95,7 +95,7 @@
9595
Text="{helpers:ResourceString Name=Behaviors}" />
9696

9797
<!-- Opening items -->
98-
<wctcontrols:SettingsExpander AutomationProperties.AutomationControlType="Custom" Header="{helpers:ResourceString Name=OpeningItems}">
98+
<wctcontrols:SettingsExpander Header="{helpers:ResourceString Name=OpeningItems}">
9999
<wctcontrols:SettingsExpander.HeaderIcon>
100100
<FontIcon Glyph="&#xED25;" />
101101
</wctcontrols:SettingsExpander.HeaderIcon>
@@ -167,10 +167,7 @@
167167
</wctcontrols:SettingsCard>
168168

169169
<!-- Calculate folder sizes -->
170-
<wctcontrols:SettingsExpander
171-
AutomationProperties.AutomationControlType="Custom"
172-
Header="{helpers:ResourceString Name=CalculateFolderSizes}"
173-
IsExpanded="True">
170+
<wctcontrols:SettingsExpander Header="{helpers:ResourceString Name=CalculateFolderSizes}" IsExpanded="True">
174171
<wctcontrols:SettingsExpander.HeaderIcon>
175172
<FontIcon Glyph="&#xEE40;" />
176173
</wctcontrols:SettingsExpander.HeaderIcon>

‎src/Files.App/Views/Settings/GeneralPage.xaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
</wctcontrols:SettingsCard>
8585

8686
<!-- Startup settings -->
87-
<wctcontrols:SettingsExpander AutomationProperties.AutomationControlType="Custom" Header="{helpers:ResourceString Name=StartupSettings}">
87+
<wctcontrols:SettingsExpander Header="{helpers:ResourceString Name=StartupSettings}">
8888
<wctcontrols:SettingsExpander.HeaderIcon>
8989
<FontIcon Glyph="&#xE7E8;" />
9090
</wctcontrols:SettingsExpander.HeaderIcon>
@@ -176,7 +176,7 @@
176176
</wctcontrols:SettingsExpander>
177177

178178
<!-- Dual Pane -->
179-
<wctcontrols:SettingsExpander AutomationProperties.AutomationControlType="Custom" Header="{helpers:ResourceString Name=SettingsMultitaskingAlwaysOpenDualPane}">
179+
<wctcontrols:SettingsExpander Header="{helpers:ResourceString Name=SettingsMultitaskingAlwaysOpenDualPane}">
180180
<wctcontrols:SettingsExpander.HeaderIcon>
181181
<FontIcon Glyph="&#xE89F;" />
182182
</wctcontrols:SettingsExpander.HeaderIcon>
@@ -203,7 +203,7 @@
203203
</wctcontrols:SettingsCard>
204204

205205
<!-- Widgets -->
206-
<wctcontrols:SettingsExpander AutomationProperties.AutomationControlType="Custom" Header="{helpers:ResourceString Name=Widgets}">
206+
<wctcontrols:SettingsExpander Header="{helpers:ResourceString Name=Widgets}">
207207
<wctcontrols:SettingsExpander.HeaderIcon>
208208
<FontIcon Glyph="&#xF246;" />
209209
</wctcontrols:SettingsExpander.HeaderIcon>
@@ -239,7 +239,7 @@
239239
Text="{helpers:ResourceString Name=SettingsContextMenu/Text}" />
240240

241241
<!-- Context menu options -->
242-
<wctcontrols:SettingsExpander AutomationProperties.AutomationControlType="Custom" Header="{helpers:ResourceString Name=ContextMenuOptions}">
242+
<wctcontrols:SettingsExpander Header="{helpers:ResourceString Name=ContextMenuOptions}">
243243
<wctcontrols:SettingsExpander.HeaderIcon>
244244
<FontIcon Glyph="&#xE74C;" />
245245
</wctcontrols:SettingsExpander.HeaderIcon>

‎src/Files.App/Views/Settings/LayoutPage.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
Text="{helpers:ResourceString Name=SortingAndGrouping}" />
7272

7373
<!-- Default sorting options -->
74-
<wctcontrols:SettingsExpander AutomationProperties.AutomationControlType="Custom" Header="{helpers:ResourceString Name=SortBy}">
74+
<wctcontrols:SettingsExpander Header="{helpers:ResourceString Name=SortBy}">
7575
<wctcontrols:SettingsExpander.HeaderIcon>
7676
<FontIcon Glyph="&#xE8CB;" />
7777
</wctcontrols:SettingsExpander.HeaderIcon>
@@ -147,7 +147,7 @@
147147
Text="{helpers:ResourceString Name=DetailsView}" />
148148

149149
<!-- Columns -->
150-
<wctcontrols:SettingsExpander AutomationProperties.AutomationControlType="Custom" Header="{helpers:ResourceString Name=Columns}">
150+
<wctcontrols:SettingsExpander Header="{helpers:ResourceString Name=Columns}">
151151
<wctcontrols:SettingsExpander.HeaderIcon>
152152
<FontIcon Glyph="&#xE71D;" />
153153
</wctcontrols:SettingsExpander.HeaderIcon>

‎src/Files.App/Views/Settings/TagsPage.xaml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,7 @@
4747
Text="{helpers:ResourceString Name=FileTags}" />
4848

4949
<!-- Edit Tags -->
50-
<wctcontrols:SettingsExpander
51-
AutomationProperties.AutomationControlType="Custom"
52-
Header="{helpers:ResourceString Name=FileTags}"
53-
IsExpanded="True">
50+
<wctcontrols:SettingsExpander Header="{helpers:ResourceString Name=FileTags}" IsExpanded="True">
5451
<wctcontrols:SettingsExpander.HeaderIcon>
5552
<FontIcon Glyph="&#xE8EC;" />
5653
</wctcontrols:SettingsExpander.HeaderIcon>

‎tests/Files.InteractionTests/Tests/SettingsTests.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ public void VerifySettingsAreAccessible()
2828
{
2929
"SettingsItemGeneral",
3030
"SettingsItemAppearance",
31-
////"SettingsItemLayout", TODO find workaround for the "Group by" setting block issue
32-
//"SettingsItemFolders",
33-
//"SettingsItemActions",
34-
//"SettingsItemTags",
35-
//"SettingsItemDevTools",
36-
//"SettingsItemAdvanced",
37-
//"SettingsItemAbout"
31+
//"SettingsItemLayout", TODO find workaround for the "Group by" setting block issue
32+
"SettingsItemFolders",
33+
"SettingsItemActions",
34+
"SettingsItemTags",
35+
"SettingsItemDevTools",
36+
"SettingsItemAdvanced",
37+
"SettingsItemAbout"
3838
};
3939

4040
foreach (var item in settingsItems)

0 commit comments

Comments
 (0)