| 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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 <div class="start"> | 83 <div class="start"> |
| 84 <div id="displayMirrorCheckboxLabel">$i18n{displayMirror}</div> | 84 <div id="displayMirrorCheckboxLabel">$i18n{displayMirror}</div> |
| 85 <div class="secondary">[[getDisplayMirrorText_(displays)]]</div> | 85 <div class="secondary">[[getDisplayMirrorText_(displays)]]</div> |
| 86 </div> | 86 </div> |
| 87 <paper-toggle-button checked="[[isMirrored_(displays)]]" | 87 <paper-toggle-button checked="[[isMirrored_(displays)]]" |
| 88 on-tap="onMirroredTap_" | 88 on-tap="onMirroredTap_" |
| 89 aria-labelledby="displayMirrorCheckboxLabel"> | 89 aria-labelledby="displayMirrorCheckboxLabel"> |
| 90 </div> | 90 </div> |
| 91 <div class="settings-box embedded" | 91 <div class="settings-box embedded" |
| 92 hidden$="[[!showDisplaySelectMenu_(displays, selectedDisplay)]]"> | 92 hidden$="[[!showDisplaySelectMenu_(displays, selectedDisplay)]]"> |
| 93 <div class="start">$i18n{displayScreenTitle}</div> | 93 <div id="displayScreenTitle" class="start"> |
| 94 $i18n{displayScreenTitle} |
| 95 </div> |
| 94 <div class="md-select-wrapper"> | 96 <div class="md-select-wrapper"> |
| 95 <select class="md-select" on-change="updatePrimaryDisplay_" | 97 <select class="md-select" on-change="updatePrimaryDisplay_" |
| 98 aria-labelledby="displayScreenTitle" |
| 96 value="[[getDisplaySelectMenuIndex_( | 99 value="[[getDisplaySelectMenuIndex_( |
| 97 selectedDisplay, primaryDisplayId)]]"> | 100 selectedDisplay, primaryDisplayId)]]"> |
| 98 <option value="0">$i18n{displayScreenPrimary}</option> | 101 <option value="0">$i18n{displayScreenPrimary}</option> |
| 99 <option value="1">$i18n{displayScreenExtended}</option> | 102 <option value="1">$i18n{displayScreenExtended}</option> |
| 100 </select> | 103 </select> |
| 101 <span class="md-select-underline"></span> | 104 <span class="md-select-underline"></span> |
| 102 </div> | 105 </div> |
| 103 </div> | 106 </div> |
| 104 <div class="settings-box embedded two-line"> | 107 <div class="settings-box embedded two-line"> |
| 105 <div class="start textarea layout vertical"> | 108 <div class="start textarea layout vertical"> |
| 106 <div>$i18n{displayResolutionTitle}</div> | 109 <div>$i18n{displayResolutionTitle}</div> |
| 107 <div class="secondary layout self-start"> | 110 <div class="secondary layout self-start"> |
| 108 [[getResolutionText_(selectedDisplay, selectedModePref_.value)]] | 111 [[getResolutionText_(selectedDisplay, selectedModePref_.value)]] |
| 109 </div> | 112 </div> |
| 110 </div> | 113 </div> |
| 111 <settings-slider disabled="[[!enableSetResolution_(selectedDisplay)]]" | 114 <settings-slider disabled="[[!enableSetResolution_(selectedDisplay)]]" |
| 112 tick-values="[[modeValues_]]" pref="{{selectedModePref_}}" | 115 tick-values="[[modeValues_]]" pref="{{selectedModePref_}}" |
| 113 on-change="onSelectedModeChange_"> | 116 on-change="onSelectedModeChange_"> |
| 114 </settings-slider> | 117 </settings-slider> |
| 115 </div> | 118 </div> |
| 116 <div class="settings-box embedded"> | 119 <div class="settings-box embedded"> |
| 117 <div class="start textarea">$i18n{displayOrientation}</div> | 120 <div id="displayOrientation" class="start textarea"> |
| 121 $i18n{displayOrientation} |
| 122 </div> |
| 118 <div class="md-select-wrapper"> | 123 <div class="md-select-wrapper"> |
| 119 <select class="md-select" value="[[selectedDisplay.rotation]]" | 124 <select class="md-select" value="[[selectedDisplay.rotation]]" |
| 125 aria-labelledby="displayOrientation" |
| 120 on-change="onOrientationChange_"> | 126 on-change="onOrientationChange_"> |
| 121 <option value="0">$i18n{displayOrientationStandard}</option> | 127 <option value="0">$i18n{displayOrientationStandard}</option> |
| 122 <option value="90">90</option> | 128 <option value="90">90</option> |
| 123 <option value="180">180</option> | 129 <option value="180">180</option> |
| 124 <option value="270">270</option> | 130 <option value="270">270</option> |
| 125 </select> | 131 </select> |
| 126 <span class="md-select-underline"></span> | 132 <span class="md-select-underline"></span> |
| 127 </div> | 133 </div> |
| 128 </div> | 134 </div> |
| 129 <div class="settings-box embedded two-line" | 135 <div class="settings-box embedded two-line" |
| (...skipping 25 matching lines...) Expand all Loading... |
| 155 </div> | 161 </div> |
| 156 </div> | 162 </div> |
| 157 <button class="subpage-arrow" is="paper-icon-button-light" | 163 <button class="subpage-arrow" is="paper-icon-button-light" |
| 158 aria-label="$i18n{displayTouchCalibrationTitle}" | 164 aria-label="$i18n{displayTouchCalibrationTitle}" |
| 159 aria-describedby="touchCalibrationSecondary"></button> | 165 aria-describedby="touchCalibrationSecondary"></button> |
| 160 </div> | 166 </div> |
| 161 </div> | 167 </div> |
| 162 </template> | 168 </template> |
| 163 <script src="display.js"></script> | 169 <script src="display.js"></script> |
| 164 </dom-module> | 170 </dom-module> |
| OLD | NEW |