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

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

Issue 2921973002: Hide Night Light behind a flag (Closed)
Patch Set: James' comments Created 3 years, 6 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/html/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.html">
2 2
3 <link rel="import" href="chrome://resources/html/assert.html"> 3 <link rel="import" href="chrome://resources/html/assert.html">
4 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html"> 4 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html">
5 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 5 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
6 <link rel="import" href="chrome://resources/html/md_select_css.html"> 6 <link rel="import" href="chrome://resources/html/md_select_css.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html">
8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-tabs/paper-tabs.h tml"> 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-tabs/paper-tabs.h tml">
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 $i18n{displayTouchCalibrationText} 195 $i18n{displayTouchCalibrationText}
196 </div> 196 </div>
197 </div> 197 </div>
198 <button class="subpage-arrow" is="paper-icon-button-light" 198 <button class="subpage-arrow" is="paper-icon-button-light"
199 aria-label="$i18n{displayTouchCalibrationTitle}" 199 aria-label="$i18n{displayTouchCalibrationTitle}"
200 aria-describedby="touchCalibrationSecondary"></button> 200 aria-describedby="touchCalibrationSecondary"></button>
201 </div> 201 </div>
202 </div> 202 </div>
203 203
204 <!-- Night Light Settings --> 204 <!-- Night Light Settings -->
205 <div class="settings-box"> 205 <template is="dom-if" if="[[nightLightFeatureEnabled_]]" restamp>
206 <div class="start"> 206 <div class="settings-box">
207 <h2 id="nightLightLabel">$i18n{displayNightLightLabel}</h2> 207 <div class="start">
208 <div class="secondary">$i18n{displayNightLightText}</div> 208 <h2 id="nightLightLabel">$i18n{displayNightLightLabel}</h2>
209 <div class="secondary">$i18n{displayNightLightText}</div>
210 </div>
211 <settings-toggle-button
212 id="nightLightToggleButton"
213 pref="{{prefs.ash.night_light.enabled}}"
214 aria-labelledby="nightLightLabel">
215 </settings-toggle-button>
209 </div> 216 </div>
210 <settings-toggle-button 217 <div id="nightLightSettingsDiv"
211 id="nightLightToggleButton" 218 class="settings-box continuation start layout vertical">
212 pref="{{prefs.ash.night_light.enabled}}" 219 <!-- Color temperature slider -->
213 aria-labelledby="nightLightLabel"> 220 <div class="settings-box embedded continuation">
214 </settings-toggle-button> 221 <div class="start textarea" id="colorTemperatureLabel">
215 </div> 222 $i18n{displayNightLightTemperatureLabel}
216 <div id="nightLightSettingsDiv" 223 </div>
217 class="settings-box continuation start layout vertical"> 224 <settings-slider id="colorTemperatureSlider"
218 <!-- Color temperature slider --> 225 aria-labelledby="colorTemperatureLabel" min="0" max="100"
219 <div class="settings-box embedded continuation"> 226 scale="100" label-min="$i18n{displayNightLightTempSliderMinLabel}"
220 <div class="start textarea" id="colorTemperatureLabel"> 227 label-max="$i18n{displayNightLightTempSliderMaxLabel}"
221 $i18n{displayNightLightTemperatureLabel} 228 pref="{{prefs.ash.night_light.color_temperature}}">
229 </settings-slider>
222 </div> 230 </div>
223 <settings-slider id="colorTemperatureSlider"
224 aria-labelledby="colorTemperatureLabel" min="0" max="100" scale="100"
225 label-min="$i18n{displayNightLightTempSliderMinLabel}"
226 label-max="$i18n{displayNightLightTempSliderMaxLabel}"
227 pref="{{prefs.ash.night_light.color_temperature}}">
228 </settings-slider>
229 </div> 231 </div>
230 </div> 232 </template>
231 233
232 </template> 234 </template>
233 <script src="display.js"></script> 235 <script src="display.js"></script>
234 </dom-module> 236 </dom-module>
OLDNEW
« no previous file with comments | « chrome/browser/flag_descriptions.cc ('k') | chrome/browser/resources/settings/device_page/display.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698