diff options
| author | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-31 17:31:38 +0000 |
|---|---|---|
| committer | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-31 17:31:38 +0000 |
| commit | f3583ec80bcd9e3f561a2596924194a8e9c6d92e (patch) | |
| tree | f2ba6497c5e7da26a700153077de56e50afb61f9 | |
| parent | 7abfb34663112cb6ca7e467df94bffa99957363f (diff) | |
| download | chromium_src-f3583ec80bcd9e3f561a2596924194a8e9c6d92e.zip chromium_src-f3583ec80bcd9e3f561a2596924194a8e9c6d92e.tar.gz chromium_src-f3583ec80bcd9e3f561a2596924194a8e9c6d92e.tar.bz2 | |
Landing http://codereview.chromium.org/6326013/ on behalf of dgozman@chromium.org:
Added labels 'less' and 'more' under trackpad sensitivity slider in settings->system->touchpad.
BUG=chromium-os:9004
TEST=Open chrome://settings, navigate to System->Touchpad and observe labels under the sensitivity slider.
Review URL: http://codereview.chromium.org/6344019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73155 0039d316-1c4b-4281-b951-d872f2087c98
5 files changed, 24 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index fb9f44b..d2ce2c3 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -9311,6 +9311,12 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_OPTIONS_SETTINGS_SENSITIVITY_DESCRIPTION" desc="In the settings tab, the text next to the slider for the touchpad touch sensitivity."> Sensitivity: </message> + <message name="IDS_OPTIONS_SETTINGS_SENSITIVITY_LESS_DESCRIPTION" desc="In the settings tab, the text under the left (less sensitive) side of the slider for the touchpad touch sensitivity."> + Less + </message> + <message name="IDS_OPTIONS_SETTINGS_SENSITIVITY_MORE_DESCRIPTION" desc="In the settings tab, the text under the right (more sensitive) side of the slider for the touchpad touch sensitivity."> + More + </message> <message name="IDS_OPTIONS_SETTINGS_ACCESSIBILITY_DESCRIPTION" desc="In the settings tab, the text next to the checkbox for accessbility."> Enable accessibility features </message> diff --git a/chrome/browser/chromeos/dom_ui/system_options_handler.cc b/chrome/browser/chromeos/dom_ui/system_options_handler.cc index 9c6398c..95f87e6 100644 --- a/chrome/browser/chromeos/dom_ui/system_options_handler.cc +++ b/chrome/browser/chromeos/dom_ui/system_options_handler.cc @@ -49,6 +49,12 @@ void SystemOptionsHandler::GetLocalizedValues( IDS_OPTIONS_SETTINGS_TAP_TO_CLICK_ENABLED_DESCRIPTION)); localized_strings->SetString("sensitivity", l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_SENSITIVITY_DESCRIPTION)); + localized_strings->SetString("sensitivity_less", + l10n_util::GetStringUTF16( + IDS_OPTIONS_SETTINGS_SENSITIVITY_LESS_DESCRIPTION)); + localized_strings->SetString("sensitivity_more", + l10n_util::GetStringUTF16( + IDS_OPTIONS_SETTINGS_SENSITIVITY_MORE_DESCRIPTION)); localized_strings->SetString("language", l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_SECTION_TITLE_LANGUAGE)); diff --git a/chrome/browser/resources/options/chromeos_system_options.html b/chrome/browser/resources/options/chromeos_system_options.html index c62f1ca..93cf00b 100644 --- a/chrome/browser/resources/options/chromeos_system_options.html +++ b/chrome/browser/resources/options/chromeos_system_options.html @@ -25,6 +25,14 @@ </td> </tr> <tr> + <td></td> + <td> + <span i18n-content="sensitivity_less"></span> + <span i18n-content="sensitivity_more" + class="touchpad-sensitivity-more"></span> + </td> + </tr> + <tr> <td class="option-name" colspan="2"> <label class="checkbox"> <input id="tap-to-click-check" diff --git a/chrome/browser/resources/options/chromeos_system_options_page.css b/chrome/browser/resources/options/chromeos_system_options_page.css new file mode 100644 index 0000000..988c987 --- /dev/null +++ b/chrome/browser/resources/options/chromeos_system_options_page.css @@ -0,0 +1,3 @@ +.touchpad-sensitivity-more { + float: right; +} diff --git a/chrome/browser/resources/options/options.html b/chrome/browser/resources/options/options.html index c75758a..04e60b5 100644 --- a/chrome/browser/resources/options/options.html +++ b/chrome/browser/resources/options/options.html @@ -36,6 +36,7 @@ <link rel="stylesheet" href="chromeos_accounts_options_page.css"> <link rel="stylesheet" href="chromeos_internet_options_page.css"> <link rel="stylesheet" href="chromeos_proxy.css"> + <link rel="stylesheet" href="chromeos_system_options_page.css"> </if> <if expr="not pp_ifdef('win32') and not pp_ifdef('darwin')"> |