| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 2 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 2 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 3 <link rel="import" href="chrome://resources/html/md_select_css.html"> | 3 <link rel="import" href="chrome://resources/html/md_select_css.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe
s/iron-flex-layout.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe
s/iron-flex-layout.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-tabs/paper-tabs.h
tml"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-tabs/paper-tabs.h
tml"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap
er-toggle-button.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap
er-toggle-button.html"> |
| 9 <link rel="import" href="display_layout.html"> | 9 <link rel="import" href="display_layout.html"> |
| 10 <link rel="import" href="display_overscan_dialog.html"> | 10 <link rel="import" href="display_overscan_dialog.html"> |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 <option value="0">$i18n{displayOrientationStandard}</option> | 153 <option value="0">$i18n{displayOrientationStandard}</option> |
| 154 <option value="90">90</option> | 154 <option value="90">90</option> |
| 155 <option value="180">180</option> | 155 <option value="180">180</option> |
| 156 <option value="270">270</option> | 156 <option value="270">270</option> |
| 157 </select> | 157 </select> |
| 158 <span class="md-select-underline"></span> | 158 <span class="md-select-underline"></span> |
| 159 </div> | 159 </div> |
| 160 </div> | 160 </div> |
| 161 </template> | 161 </template> |
| 162 | 162 |
| 163 <div class="settings-box embedded two-line" | 163 <div id="overscan" class="settings-box embedded two-line" |
| 164 on-tap="onOverscanTap_" hidden$="[[selectedDisplay.isInternal]]" | 164 on-tap="onOverscanTap_" hidden$="[[selectedDisplay.isInternal]]" |
| 165 actionable> | 165 actionable> |
| 166 <div class="start"> | 166 <div class="start"> |
| 167 $i18n{displayOverscanPageTitle} | 167 $i18n{displayOverscanPageTitle} |
| 168 <div class="secondary" id="displayOverscanSecondary"> | 168 <div class="secondary" id="displayOverscanSecondary"> |
| 169 $i18n{displayOverscanPageText} | 169 $i18n{displayOverscanPageText} |
| 170 </div> | 170 </div> |
| 171 </div> | 171 </div> |
| 172 <button class="subpage-arrow" is="paper-icon-button-light" | 172 <button class="subpage-arrow" is="paper-icon-button-light" |
| 173 aria-label="$i18n{displayOverscanPageTitle}" | 173 aria-label="$i18n{displayOverscanPageTitle}" |
| 174 aria-describedby="displayOverscanSecondary"></button> | 174 aria-describedby="displayOverscanSecondary"></button> |
| 175 </div> | 175 </div> |
| 176 | 176 |
| 177 <settings-display-overscan-dialog id="displayOverscan" | 177 <settings-display-overscan-dialog id="displayOverscan" |
| 178 display-id="{{overscanDisplayId}}"> | 178 display-id="{{overscanDisplayId}}" |
| 179 on-close="onCloseOverscanDialog_"> |
| 179 </settings-display-overscan-dialog> | 180 </settings-display-overscan-dialog> |
| 180 | 181 |
| 181 <div class="settings-box embedded two-line" | 182 <div class="settings-box embedded two-line" |
| 182 on-tap="onTouchCalibrationTap_" | 183 on-tap="onTouchCalibrationTap_" |
| 183 hidden$="[[!showTouchCalibrationSetting_(selectedDisplay)]]" | 184 hidden$="[[!showTouchCalibrationSetting_(selectedDisplay)]]" |
| 184 actionable> | 185 actionable> |
| 185 <div class="start"> | 186 <div class="start"> |
| 186 $i18n{displayTouchCalibrationTitle} | 187 $i18n{displayTouchCalibrationTitle} |
| 187 <div class="secondary" id="touchCalibrationSecondary"> | 188 <div class="secondary" id="touchCalibrationSecondary"> |
| 188 $i18n{displayTouchCalibrationText} | 189 $i18n{displayTouchCalibrationText} |
| 189 </div> | 190 </div> |
| 190 </div> | 191 </div> |
| 191 <button class="subpage-arrow" is="paper-icon-button-light" | 192 <button class="subpage-arrow" is="paper-icon-button-light" |
| 192 aria-label="$i18n{displayTouchCalibrationTitle}" | 193 aria-label="$i18n{displayTouchCalibrationTitle}" |
| 193 aria-describedby="touchCalibrationSecondary"></button> | 194 aria-describedby="touchCalibrationSecondary"></button> |
| 194 </div> | 195 </div> |
| 195 </div> | 196 </div> |
| 196 </template> | 197 </template> |
| 197 <script src="display.js"></script> | 198 <script src="display.js"></script> |
| 198 </dom-module> | 199 </dom-module> |
| OLD | NEW |