[Night Light] CL5: Schedule Settings

chrome/browser/resources/settings/device_page/display.html

Index: chrome/browser/resources/settings/device_page/display.html
diff --git a/chrome/browser/resources/settings/device_page/display.html b/chrome/browser/resources/settings/device_page/display.html
index 9e0676cfc1ca6b37cc568c0a2eb07ebb022295cf..fa9bdfa63887ad86c9c641416aa576272f083306 100644
--- a/chrome/browser/resources/settings/device_page/display.html
+++ b/chrome/browser/resources/settings/device_page/display.html
@@ -11,6 +11,8 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/paper-toggle-button.html">
 <link rel="import" href="display_layout.html">
 <link rel="import" href="display_overscan_dialog.html">
+<link rel="import" href="night_light_slider.html">
+<link rel="import" href="../controls/settings_dropdown_menu.html">
 <link rel="import" href="../controls/settings_slider.html">
 <link rel="import" href="../prefs/prefs_behavior.html">
 <link rel="import" href="../settings_shared_css.html">
@@ -55,6 +57,10 @@
      #controlsDiv > .settings-box:first-of-type {
        border-top: none;
      }
+
+     #nightLightSlider {
+       margin-top: 20px;
+     }
     </style>
     <div class="settings-box first layout vertical self-stretch">
       <h2 class="layout self-start">
@@ -228,6 +234,30 @@
               pref="{{prefs.ash.night_light.color_temperature}}">
           </settings-slider>
         </div>
+        <!-- Schedule settings -->
+        <div class="settings-box embedded">
+          <div id="nightLightScheduleLabel" class="start textarea">
+            $i18n{displayNightLightScheduleLabel}
+          </div>
+          <settings-dropdown-menu
+              id="nightLightScheduleTypeDropDown"
+              lable="$i18n{displayNightLightScheduleLabel}"

[stevenjb, 2017/06/09 22:51:45]

label= (it doesn't like this is needed/used?)

[afakhry, 2017/06/12 18:07:08]

Done.

+              aria-labelledby="nightLightScheduleLabel"
+              pref="{{prefs.ash.night_light.schedule_type}}"
+              menu-options="[[scheduleTypesList_]]">
+          </settings-dropdown-menu>
+        </div>
+        <!-- Custom schedule slider -->
+        <div class="settings-box embedded continuation">
+          <iron-collapse id="nightLightCustomScheduleCollapse"
+              class="start textarea layout vertical"
+              opened="[[shouldOpenCustomScheduleCollapse_]]">
+            <div class="settings-box embedded continuation">
+              <night-light-slider id="nightLightSlider" prefs="{{prefs}}">
+              </night-light-slider>
+            </div>
+          </iron-collapse>
+        </div>
       </div>
     </template>