0

[Magnifier] Clean up magnifier settings by removing extra labels

Since the radio button group title isn't displayed, and the localizers had some trouble with these phrases, clean up by removing for now.

Fixed: 1175264
Change-Id: Ic9dfdf940cabdf5c1d4938ad892d809e5f10f87e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2679923
Reviewed-by: Jimmy Gong <jimmyxgong@chromium.org>
Commit-Queue: Josiah Krutz <josiahk@google.com>
Cr-Commit-Position: refs/heads/master@{#851435}
This commit is contained in:
Josiah K
2021-02-06 05:44:27 +00:00
committed by Chromium LUCI CQ
parent 10aa8dfd1f
commit f39cf61bce
6 changed files with 0 additions and 28 deletions

@@ -1065,9 +1065,6 @@
<message name="IDS_OS_SETTINGS_TAG_A11Y_FULLSCREEN_MAGNIFIER_FOCUS_FOLLOWING" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable full-screen magnification keyboard focus-following.">
Magnifier follows keyboard focus
</message>
<message name="IDS_OS_SETTINGS_TAG_A11Y_FULLSCREEN_MAGNIFIER_MOUSE_FOLLOWING_MODE" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a set of radio buttons to choose which mouse following mode to use for the full-screen magnifier. This feature allows the user of full screen magnifier to choose how the zoomed-in screen moves as their mouse moves within the screen. The options are 'Move screen continuously as mouse moves', 'Move screen keeping mouse at center of screen', and 'Move screen when mouse touches edges of screen'.">
Magnifier mouse following mode
</message>
<message name="IDS_OS_SETTINGS_TAG_A11Y_DOCKED_MAGNIFIER" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable docked screen magnification.">
Docked magnifier
</message>

@@ -816,9 +816,6 @@
<message name="IDS_SETTINGS_SCREEN_MAGNIFIER_LABEL" desc="Label for checkbox which enables the fullscreen magnifier">
Enable fullscreen magnifier
</message>
<message name="IDS_SETTINGS_SCREEN_MANIFIER_MOUSE_FOLLOWING_MODE_RADIO_GROUP_TITLE" desc="The title of the radio group that allows the user to configure the mouse following mode of the full screen magnifier. This feature allows the user of full screen magnifier to choose how the zoomed-in screen moves as their mouse moves within the screen. The options are 'Move screen continuously as mouse moves', 'Move screen keeping mouse at center of screen', and 'Move screen when mouse touches edges of screen'.">
Mouse following mode
</message>
<message name="IDS_SETTINGS_SCREEN_MANIFIER_MOUSE_FOLLOWING_MODE_CONTINUOUS" desc="Label for the radio button that allows the user to choose the 'continuous' mouse following mode for the full screen magnifier, which moves the zoomed-in screen continuously (underneath the cursor in the opposite direction) as the mouse moves towards the edges of the screen. This feature allows the user of full screen magnifier to choose how the zoomed-in screen moves as their mouse moves within the screen. The options are 'Move screen continuously as mouse moves', 'Move screen keeping mouse at center of screen', and 'Move screen when mouse touches edges of screen'.">
Move screen continuously as mouse moves
</message>

@@ -100,8 +100,6 @@
<div class="settings-box continuation">
<settings-radio-group id="screenMagnifierMouseFollowingModeRadioGroup"
pref="{{prefs.settings.a11y.screen_magnifier_mouse_following_mode}}"
group-aria-label="$i18n{screenMagnifierMouseFollowingModeRadioGroupTitle}"
deep-link-focus-id$="[[Setting.kFullscreenMagnifierMouseFollowingMode]]"
class="sub-item">
<controlled-radio-button
id="screenMagnifierMouseFollowingModeContinuous"

@@ -322,18 +322,6 @@ GetA11yFullscreenMagnifierFocusFollowingSearchConcepts() {
});
return *tags;
}
const std::vector<SearchConcept>&
GetA11yFullscreenMagnifierMouseFollowingModeSearchConcepts() {
static const base::NoDestructor<std::vector<SearchConcept>> tags({
{IDS_OS_SETTINGS_TAG_A11Y_FULLSCREEN_MAGNIFIER_MOUSE_FOLLOWING_MODE,
mojom::kManageAccessibilitySubpagePath,
mojom::SearchResultIcon::kA11y,
mojom::SearchResultDefaultRank::kLow,
mojom::SearchResultType::kSetting,
{.setting = mojom::Setting::kFullscreenMagnifierMouseFollowingMode}},
});
return *tags;
}
bool AreExperimentalA11yLabelsAllowed() {
return base::FeatureList::IsEnabled(
@@ -448,8 +436,6 @@ void AccessibilitySection::AddLoadTimeData(
{"chromeVoxLabel", IDS_SETTINGS_CHROMEVOX_LABEL},
{"chromeVoxOptionsLabel", IDS_SETTINGS_CHROMEVOX_OPTIONS_LABEL},
{"screenMagnifierLabel", IDS_SETTINGS_SCREEN_MAGNIFIER_LABEL},
{"screenMagnifierMouseFollowingModeRadioGroupTitle",
IDS_SETTINGS_SCREEN_MANIFIER_MOUSE_FOLLOWING_MODE_RADIO_GROUP_TITLE},
{"screenMagnifierMouseFollowingModeContinuous",
IDS_SETTINGS_SCREEN_MANIFIER_MOUSE_FOLLOWING_MODE_CONTINUOUS},
{"screenMagnifierMouseFollowingModeCentered",
@@ -876,13 +862,9 @@ void AccessibilitySection::UpdateSearchTags() {
ash::prefs::kAccessibilityScreenMagnifierEnabled)) {
updater.AddSearchTags(
GetA11yFullscreenMagnifierFocusFollowingSearchConcepts());
updater.AddSearchTags(
GetA11yFullscreenMagnifierMouseFollowingModeSearchConcepts());
} else {
updater.RemoveSearchTags(
GetA11yFullscreenMagnifierFocusFollowingSearchConcepts());
updater.RemoveSearchTags(
GetA11yFullscreenMagnifierMouseFollowingModeSearchConcepts());
}
if (!pref_service_->GetBoolean(