Commit 6302068a authored by sammiequon's avatar sammiequon Committed by Commit bot

Autoclick on md-settings is synced with autoclick on settings.

BUG=623944
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2153963002
Cr-Commit-Position: refs/heads/master@{#406717}
parent 74ed884d
...@@ -136,19 +136,19 @@ ...@@ -136,19 +136,19 @@
Delay before click: Delay before click:
</message> </message>
<message name="IDS_SETTINGS_DELAY_BEFORE_CLICK_EXTREMELY_SHORT" desc="Description of an extremely short delay before clicks."> <message name="IDS_SETTINGS_DELAY_BEFORE_CLICK_EXTREMELY_SHORT" desc="Description of an extremely short delay before clicks.">
extremely short extremely short (600ms)
</message> </message>
<message name="IDS_SETTINGS_DELAY_BEFORE_CLICK_VERY_SHORT" desc="Description of a very short delay before clicks."> <message name="IDS_SETTINGS_DELAY_BEFORE_CLICK_VERY_SHORT" desc="Description of a very short delay before clicks.">
very short very short (800ms)
</message> </message>
<message name="IDS_SETTINGS_DELAY_BEFORE_CLICK_SHORT" desc="Description of a short delay before clicks."> <message name="IDS_SETTINGS_DELAY_BEFORE_CLICK_SHORT" desc="Description of a short delay before clicks.">
short short (1000ms)
</message> </message>
<message name="IDS_SETTINGS_DELAY_BEFORE_CLICK_LONG" desc="Description of a long delay before clicks."> <message name="IDS_SETTINGS_DELAY_BEFORE_CLICK_LONG" desc="Description of a long delay before clicks.">
long long (2000ms)
</message> </message>
<message name="IDS_SETTINGS_DELAY_BEFORE_CLICK_VERY_LONG" desc="Description of a very long delay before clicks."> <message name="IDS_SETTINGS_DELAY_BEFORE_CLICK_VERY_LONG" desc="Description of a very long delay before clicks.">
very long very long (4000ms)
</message> </message>
<message name="IDS_SETTINGS_ON_SCREEN_KEYBOARD_LABEL" desc="Label for checkbox which enables an on-screen keyboard."> <message name="IDS_SETTINGS_ON_SCREEN_KEYBOARD_LABEL" desc="Label for checkbox which enables an on-screen keyboard.">
Enable on-screen keyboard Enable on-screen keyboard
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<link rel="import" href="/controls/settings_checkbox.html"> <link rel="import" href="/controls/settings_checkbox.html">
</if> </if>
<link rel="import" href="/settings_shared_css.html"> <link rel="import" href="/settings_shared_css.html">
<link rel="import" href="/i18n_setup.html">
<dom-module id="settings-a11y-page"> <dom-module id="settings-a11y-page">
<template> <template>
...@@ -47,13 +48,10 @@ ...@@ -47,13 +48,10 @@
<div class="list-item settings-checkbox-spacer"> <div class="list-item settings-checkbox-spacer">
<div>$i18n{delayBeforeClickLabel}</div> <div>$i18n{delayBeforeClickLabel}</div>
<select value="{{prefs.settings.a11y.autoclick_delay_ms::change}}"> <settings-dropdown-menu
<option value="600">$i18n{delayBeforeClickExtremelyShort}</option> pref="{{prefs.settings.a11y.autoclick_delay_ms}}"
<option value="800">$i18n{delayBeforeClickVeryShort}</option> menu-options="[[autoClickDelayOptions_]]" no-label-float>
<option value="1000">$i18n{delayBeforeClickShort}</option> </settings-dropdown-menu>
<option value="2000">$i18n{delayBeforeClickLong}</option>
<option value="4000">$i18n{delayBeforeClickVeryLong}</option>
</select>
</div> </div>
<settings-checkbox pref="{{prefs.settings.a11y.virtual_keyboard}}" <settings-checkbox pref="{{prefs.settings.a11y.virtual_keyboard}}"
......
...@@ -27,6 +27,25 @@ Polymer({ ...@@ -27,6 +27,25 @@ Polymer({
}, },
<if expr="chromeos"> <if expr="chromeos">
autoClickDelayOptions_: {
readOnly: true,
type: Array,
value: function() {
return [
{value: 600,
name: loadTimeData.getString('delayBeforeClickExtremelyShort')},
{value: 800,
name: loadTimeData.getString('delayBeforeClickVeryShort')},
{value: 1000,
name: loadTimeData.getString('delayBeforeClickShort')},
{value: 2000,
name: loadTimeData.getString('delayBeforeClickLong')},
{value: 4000,
name: loadTimeData.getString('delayBeforeClickVeryLong')},
];
},
},
/** /**
* Whether to show experimental accessibility features. * Whether to show experimental accessibility features.
* @private {boolean} * @private {boolean}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment