| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/cr_elements/cr_slider/cr_slider.html
"> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_slider/cr_slider.html
"> |
| 2 <link rel="import" href="chrome://resources/html/polymer.html"> | 2 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-button/pape
r-radio-button.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-button/pape
r-radio-button.html"> |
| 4 <link rel="import" href="/controls/settings_checkbox.html"> | 4 <link rel="import" href="/controls/settings_checkbox.html"> |
| 5 <link rel="import" href="/controls/settings_radio_group.html"> | 5 <link rel="import" href="/controls/settings_radio_group.html"> |
| 6 <link rel="import" href="/device_page/device_page_browser_proxy.html"> | 6 <link rel="import" href="/device_page/device_page_browser_proxy.html"> |
| 7 <link rel="import" href="/settings_shared_css.html"> | 7 <link rel="import" href="/settings_shared_css.html"> |
| 8 | 8 |
| 9 <dom-module id="settings-pointers"> | 9 <dom-module id="settings-pointers"> |
| 10 <template> | 10 <template> |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 class$="[[getSubsectionClass_(hasMouse, hasTouchpad)]]"> | 29 class$="[[getSubsectionClass_(hasMouse, hasTouchpad)]]"> |
| 30 <!-- Subsection title only appears if both mouse and touchpad exist. --> | 30 <!-- Subsection title only appears if both mouse and touchpad exist. --> |
| 31 <h2 hidden$="[[!hasTouchpad]]">$i18n{mouseTitle}</h2> | 31 <h2 hidden$="[[!hasTouchpad]]">$i18n{mouseTitle}</h2> |
| 32 <div class="settings-box first"> | 32 <div class="settings-box first"> |
| 33 <settings-checkbox pref="{{prefs.settings.mouse.primary_right}}" | 33 <settings-checkbox pref="{{prefs.settings.mouse.primary_right}}" |
| 34 label="$i18n{mouseSwapButtons}"> | 34 label="$i18n{mouseSwapButtons}"> |
| 35 </settings-checkbox> | 35 </settings-checkbox> |
| 36 </div> | 36 </div> |
| 37 <div class="settings-box"> | 37 <div class="settings-box"> |
| 38 <div class="start" id="mouseSpeedLabel">$i18n{mouseSpeed}</div> | 38 <div class="start" id="mouseSpeedLabel">$i18n{mouseSpeed}</div> |
| 39 <div class="layout horizontal center"> | 39 <cr-slider value="{{prefs.settings.mouse.sensitivity2.value}}" |
| 40 <div>$i18n{pointerSlow}</div> | 40 tick-values="[[sensitivityValues_]]" |
| 41 <cr-slider class="always-on" snaps | 41 aria-labelledby="mouseSpeedLabel" |
| 42 value="{{prefs.settings.mouse.sensitivity2.value}}" | 42 label-min="$i18n{pointerSlow}" |
| 43 tick-values="[[sensitivityValues_]]" | 43 label-max="$i18n{pointerFast}"> |
| 44 aria-labelledby="mouseSpeedLabel"> | 44 </cr-slider> |
| 45 </cr-slider> | |
| 46 <div>$i18n{pointerFast}</div> | |
| 47 </div> | |
| 48 </div> | 45 </div> |
| 49 </div> | 46 </div> |
| 50 <div id="touchpad" hidden$="[[!hasTouchpad]]" | 47 <div id="touchpad" hidden$="[[!hasTouchpad]]" |
| 51 class$="[[getSubsectionClass_(hasMouse, hasTouchpad)]]"> | 48 class$="[[getSubsectionClass_(hasMouse, hasTouchpad)]]"> |
| 52 <!-- Subsection title only appears if both mouse and touchpad exist. --> | 49 <!-- Subsection title only appears if both mouse and touchpad exist. --> |
| 53 <h2 hidden$="[[!hasMouse]]">$i18n{touchpadTitle}</h2> | 50 <h2 hidden$="[[!hasMouse]]">$i18n{touchpadTitle}</h2> |
| 54 <div class="settings-box block first"> | 51 <div class="settings-box block first"> |
| 55 <settings-checkbox id="enableTapToClick" | 52 <settings-checkbox id="enableTapToClick" |
| 56 pref="{{prefs.settings.touchpad.enable_tap_to_click}}" | 53 pref="{{prefs.settings.touchpad.enable_tap_to_click}}" |
| 57 label="$i18n{touchpadTapToClickEnabledLabel}"> | 54 label="$i18n{touchpadTapToClickEnabledLabel}"> |
| 58 </settings-checkbox> | 55 </settings-checkbox> |
| 59 <settings-checkbox id="enableTapDragging" | 56 <settings-checkbox id="enableTapDragging" |
| 60 pref="{{prefs.settings.touchpad.enable_tap_dragging}}" | 57 pref="{{prefs.settings.touchpad.enable_tap_dragging}}" |
| 61 label="$i18n{tapDraggingLabel}"> | 58 label="$i18n{tapDraggingLabel}"> |
| 62 </settings-checkbox> | 59 </settings-checkbox> |
| 63 </div> | 60 </div> |
| 64 <div class="settings-box"> | 61 <div class="settings-box"> |
| 65 <div class="start" id="touchpadSpeedLabel">$i18n{touchpadSpeed}</div> | 62 <div class="start" id="touchpadSpeedLabel">$i18n{touchpadSpeed}</div> |
| 66 <div class="layout horizontal center"> | 63 <cr-slider id="touchpadSensitivity" |
| 67 <div>$i18n{pointerSlow}</div> | |
| 68 <cr-slider id="touchpadSensitivity" class="always-on" snaps | |
| 69 value="{{prefs.settings.touchpad.sensitivity2.value}}" | 64 value="{{prefs.settings.touchpad.sensitivity2.value}}" |
| 70 tick-values="[[sensitivityValues_]]" | 65 tick-values="[[sensitivityValues_]]" |
| 71 aria-labelledby="touchpadSpeedLabel"> | 66 aria-labelledby="touchpadSpeedLabel" |
| 67 label-min="$i18n{pointerSlow}" |
| 68 label-max="$i18n{pointerFast}"> |
| 72 </cr-slider> | 69 </cr-slider> |
| 73 <div>$i18n{pointerFast}</div> | |
| 74 </div> | |
| 75 </div> | 70 </div> |
| 76 <div class="settings-box">$i18n{scrollLabel}</div> | 71 <div class="settings-box">$i18n{scrollLabel}</div> |
| 77 <div class="list-frame"> | 72 <div class="list-frame"> |
| 78 <settings-radio-group pref="{{prefs.settings.touchpad.natural_scroll}}"> | 73 <settings-radio-group pref="{{prefs.settings.touchpad.natural_scroll}}"> |
| 79 <paper-radio-button name="false"> | 74 <paper-radio-button name="false"> |
| 80 $i18n{traditionalScrollLabel} | 75 $i18n{traditionalScrollLabel} |
| 81 </paper-radio-button> | 76 </paper-radio-button> |
| 82 <paper-radio-button name="true"> | 77 <paper-radio-button name="true"> |
| 83 $i18n{naturalScrollLabel} | 78 $i18n{naturalScrollLabel} |
| 84 <a href="$i18n{naturalScrollLearnMoreLink}" target="_blank" | 79 <a href="$i18n{naturalScrollLearnMoreLink}" target="_blank" |
| 85 on-tap="onLearnMoreLinkActivated_" | 80 on-tap="onLearnMoreLinkActivated_" |
| 86 on-keydown="onLearnMoreLinkActivated_"> | 81 on-keydown="onLearnMoreLinkActivated_"> |
| 87 $i18n{naturalScrollLearnMore} | 82 $i18n{naturalScrollLearnMore} |
| 88 </a> | 83 </a> |
| 89 </paper-radio-button> | 84 </paper-radio-button> |
| 90 </settings-radio-group> | 85 </settings-radio-group> |
| 91 </div> | 86 </div> |
| 92 </div> | 87 </div> |
| 93 </template> | 88 </template> |
| 94 <script src="pointers.js"></script> | 89 <script src="pointers.js"></script> |
| 95 </dom-module> | 90 </dom-module> |
| OLD | NEW |