| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/cr_elements/cr_slider/cr_slider.html
"> |
| 2 <link rel="import" href="chrome://resources/html/cr.html"> |
| 1 <link rel="import" href="chrome://resources/html/polymer.html"> | 3 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll
apse.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll
apse.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f
lex-layout-classes.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f
lex-layout-classes.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-slider/paper-slid
er.html"> | |
| 5 <link rel="import" href="/controls/settings_checkbox.html"> | 6 <link rel="import" href="/controls/settings_checkbox.html"> |
| 6 <link rel="import" href="/controls/settings_dropdown_menu.html"> | 7 <link rel="import" href="/controls/settings_dropdown_menu.html"> |
| 7 <link rel="import" href="/i18n_setup.html"> | 8 <link rel="import" href="/i18n_setup.html"> |
| 8 <link rel="import" href="/prefs/prefs_behavior.html"> | |
| 9 <link rel="import" href="/settings_shared_css.html"> | 9 <link rel="import" href="/settings_shared_css.html"> |
| 10 | 10 |
| 11 <dom-module id="settings-keyboard"> | 11 <dom-module id="settings-keyboard"> |
| 12 <template> | 12 <template> |
| 13 <style include="settings-shared"></style> | 13 <style include="settings-shared"></style> |
| 14 <div class="settings-box first"> | 14 <div class="settings-box first"> |
| 15 <div class="start">$i18n{keyboardKeySearch}</div> | 15 <div class="start">$i18n{keyboardKeySearch}</div> |
| 16 <settings-dropdown-menu | 16 <settings-dropdown-menu |
| 17 pref="{{prefs.settings.language.xkb_remap_search_key_to}}" | 17 pref="{{prefs.settings.language.xkb_remap_search_key_to}}" |
| 18 menu-options="[[keyMapTargetsWithCapsLock_]]"> | 18 menu-options="[[keyMapTargetsWithCapsLock_]]"> |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 pref="{{prefs.settings.language.xkb_auto_repeat_enabled_r2}}" | 62 pref="{{prefs.settings.language.xkb_auto_repeat_enabled_r2}}" |
| 63 label="$i18n{keyboardEnableAutoRepeat}"> | 63 label="$i18n{keyboardEnableAutoRepeat}"> |
| 64 </settings-checkbox> | 64 </settings-checkbox> |
| 65 </div> | 65 </div> |
| 66 <iron-collapse | 66 <iron-collapse |
| 67 opened="[[prefs.settings.language.xkb_auto_repeat_enabled_r2.value]]"> | 67 opened="[[prefs.settings.language.xkb_auto_repeat_enabled_r2.value]]"> |
| 68 <div class="settings-box continuation settings-checkbox-spacer"> | 68 <div class="settings-box continuation settings-checkbox-spacer"> |
| 69 <div class="start" id="repeatDelayLabel">$i18n{keyRepeatDelay}</div> | 69 <div class="start" id="repeatDelayLabel">$i18n{keyRepeatDelay}</div> |
| 70 <div class="layout horizontal center"> | 70 <div class="layout horizontal center"> |
| 71 <div>$i18n{keyRepeatDelayLong}</div> | 71 <div>$i18n{keyRepeatDelayLong}</div> |
| 72 <paper-slider id="delaySlider" class="always-on" snaps | 72 <cr-slider id="delaySlider" class="always-on" snaps |
| 73 max="[[delayMaxTick_()]]" on-change="onDelaySliderChange_" | 73 value="{{prefs.settings.language.xkb_auto_repeat_delay_r2.value}}" |
| 74 tick-values="[[autoRepeatDelays_]]" |
| 74 disabled="[[!prefs.settings.language.xkb_auto_repeat_enabled_r2.va
lue]]" | 75 disabled="[[!prefs.settings.language.xkb_auto_repeat_enabled_r2.va
lue]]" |
| 75 aria-labelledby="repeatDelayLabel"> | 76 aria-labelledby="repeatDelayLabel"> |
| 76 </paper-slider> | 77 </cr-slider> |
| 77 <div>$i18n{keyRepeatDelayShort}</div> | 78 <div>$i18n{keyRepeatDelayShort}</div> |
| 78 </div> | 79 </div> |
| 79 </div> | 80 </div> |
| 80 <div class="settings-box continuation settings-checkbox-spacer"> | 81 <div class="settings-box continuation settings-checkbox-spacer"> |
| 81 <div class="start" id="repeatRateLabel">$i18n{keyRepeatRate}</div> | 82 <div class="start" id="repeatRateLabel">$i18n{keyRepeatRate}</div> |
| 82 <div class="layout horizontal center"> | 83 <div class="layout horizontal center"> |
| 83 <div>$i18n{keyRepeatRateSlow}</div> | 84 <div>$i18n{keyRepeatRateSlow}</div> |
| 84 <paper-slider id="repeatRateSlider" class="always-on" snaps | 85 <cr-slider id="repeatRateSlider" class="always-on" snaps |
| 85 max="[[repeatRateMaxTick_()]]" | 86 value="{{prefs.settings.language.xkb_auto_repeat_interval_r2.value
}}" |
| 86 on-change="onRepeatRateSliderChange_" | 87 tick-values="[[autoRepeatIntervals_]]" |
| 87 disabled="{{!prefs.settings.language.xkb_auto_repeat_enabled_r2.va
lue}}" | 88 disabled="[[!prefs.settings.language.xkb_auto_repeat_enabled_r2.va
lue]]" |
| 88 aria-labelledby="repeatRateLabel"> | 89 aria-labelledby="repeatRateLabel"> |
| 89 </paper-slider> | 90 </cr-slider> |
| 90 <div>$i18n{keyRepeatRateFast}</div> | 91 <div>$i18n{keyRepeatRateFast}</div> |
| 91 </div> | 92 </div> |
| 92 </div> | 93 </div> |
| 93 </iron-collapse> | 94 </iron-collapse> |
| 94 <div id="keyboardOverlay" class="settings-box" | 95 <div id="keyboardOverlay" class="settings-box" |
| 95 on-tap="onShowKeyboardShortcutsOverlayTap_"> | 96 on-tap="onShowKeyboardShortcutsOverlayTap_"> |
| 96 $i18n{showKeyboardShortcutsOverlay} | 97 $i18n{showKeyboardShortcutsOverlay} |
| 97 </div> | 98 </div> |
| 98 <div class="settings-box" on-tap="onShowLanguageInputTap_"> | 99 <div class="settings-box" on-tap="onShowLanguageInputTap_"> |
| 99 $i18n{keyboardShowLanguageAndInput} | 100 $i18n{keyboardShowLanguageAndInput} |
| 100 </div> | 101 </div> |
| 101 </template> | 102 </template> |
| 102 <script src="keyboard.js"></script> | 103 <script src="keyboard.js"></script> |
| 103 </dom-module> | 104 </dom-module> |
| OLD | NEW |