Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(303)

Side by Side Diff: chrome/browser/resources/settings/device_page/keyboard.html

Issue 2737083002: [MD settings] show icon when slider controlled by something (Closed)
Patch Set: touch up Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/cr.html"> 2 <link rel="import" href="chrome://resources/html/cr.html">
3 <link rel="import" href="chrome://resources/html/polymer.html"> 3 <link rel="import" href="chrome://resources/html/polymer.html">
4 <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">
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
6 <link rel="import" href="../controls/settings_dropdown_menu.html"> 6 <link rel="import" href="../controls/settings_dropdown_menu.html">
7 <link rel="import" href="../controls/settings_toggle_button.html"> 7 <link rel="import" href="../controls/settings_toggle_button.html">
8 <link rel="import" href="../i18n_setup.html"> 8 <link rel="import" href="../i18n_setup.html">
9 <link rel="import" href="../route.html"> 9 <link rel="import" href="../route.html">
10 <link rel="import" href="../settings_shared_css.html"> 10 <link rel="import" href="../settings_shared_css.html">
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 disabled="[[ 88 disabled="[[
89 !prefs.settings.language.xkb_auto_repeat_enabled_r2.value]]" 89 !prefs.settings.language.xkb_auto_repeat_enabled_r2.value]]"
90 aria-labelledby="repeatDelayLabel" 90 aria-labelledby="repeatDelayLabel"
91 label-min="$i18n{keyRepeatDelayLong}" 91 label-min="$i18n{keyRepeatDelayLong}"
92 label-max="$i18n{keyRepeatDelayShort}"> 92 label-max="$i18n{keyRepeatDelayShort}">
93 </cr-slider> 93 </cr-slider>
94 </div> 94 </div>
95 <div class="settings-box continuation settings-checkbox-spacer"> 95 <div class="settings-box continuation settings-checkbox-spacer">
96 <div class="start" id="repeatRateLabel">$i18n{keyRepeatRate}</div> 96 <div class="start" id="repeatRateLabel">$i18n{keyRepeatRate}</div>
97 <cr-slider id="repeatRateSlider" 97 <cr-slider id="repeatRateSlider"
98 value="{{ 98 pref="{{
99 prefs.settings.language.xkb_auto_repeat_interval_r2.value}}" 99 prefs.settings.language.xkb_auto_repeat_interval_r2}}"
100 tick-values="[[autoRepeatIntervals_]]" 100 tick-values="[[autoRepeatIntervals_]]"
101 disabled="[[ 101 disabled="[[
102 !prefs.settings.language.xkb_auto_repeat_enabled_r2.value]]" 102 !prefs.settings.language.xkb_auto_repeat_enabled_r2.value]]"
103 aria-labelledby="repeatRateLabel" 103 aria-labelledby="repeatRateLabel"
104 label-min="$i18n{keyRepeatRateSlow}" 104 label-min="$i18n{keyRepeatRateSlow}"
105 label-max="$i18n{keyRepeatRateFast}"> 105 label-max="$i18n{keyRepeatRateFast}">
106 </cr-slider> 106 </cr-slider>
107 </div> 107 </div>
108 </iron-collapse> 108 </iron-collapse>
109 <div id="keyboardOverlay" class="settings-box" 109 <div id="keyboardOverlay" class="settings-box"
110 on-tap="onShowKeyboardShortcutsOverlayTap_" actionable> 110 on-tap="onShowKeyboardShortcutsOverlayTap_" actionable>
111 <div class="start">$i18n{showKeyboardShortcutsOverlay}</div> 111 <div class="start">$i18n{showKeyboardShortcutsOverlay}</div>
112 <button class="icon-external" is="paper-icon-button-light" 112 <button class="icon-external" is="paper-icon-button-light"
113 aria-label="$i18n{showKeyboardShortcutsOverlay}"></button> 113 aria-label="$i18n{showKeyboardShortcutsOverlay}"></button>
114 </div> 114 </div>
115 <div class="settings-box" on-tap="onShowLanguageInputTap_" actionable> 115 <div class="settings-box" on-tap="onShowLanguageInputTap_" actionable>
116 <div class="start">$i18n{keyboardShowLanguageAndInput}</div> 116 <div class="start">$i18n{keyboardShowLanguageAndInput}</div>
117 <button class="subpage-arrow" is="paper-icon-button-light" 117 <button class="subpage-arrow" is="paper-icon-button-light"
118 aria-label="$i18n{keyboardShowLanguageAndInput}"></button> 118 aria-label="$i18n{keyboardShowLanguageAndInput}"></button>
119 </div> 119 </div>
120 </template> 120 </template>
121 <script src="keyboard.js"></script> 121 <script src="keyboard.js"></script>
122 </dom-module> 122 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698