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

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

Issue 2620073002: Adds the touch calibration setting behind a chrome switch (Closed)
Patch Set: Resolving comment Created 3 years, 11 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/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/html/polymer.html"> 4 <link rel="import" href="chrome://resources/html/polymer.html">
5 <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/iron-flex-layout/classe s/iron-flex-layout.html">
6 <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-button/paper-butt on.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html">
8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 8 <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-tabs/paper-tabs.h tml"> 9 <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-toggle-button/pap er-toggle-button.html"> 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 <select class="md-select" value="[[selectedDisplay.rotation]]" 123 <select class="md-select" value="[[selectedDisplay.rotation]]"
124 on-change="onOrientationChange_"> 124 on-change="onOrientationChange_">
125 <option value="0">$i18n{displayOrientationStandard}</option> 125 <option value="0">$i18n{displayOrientationStandard}</option>
126 <option value="90">90</option> 126 <option value="90">90</option>
127 <option value="180">180</option> 127 <option value="180">180</option>
128 <option value="270">270</option> 128 <option value="270">270</option>
129 </select> 129 </select>
130 <span class="md-select-underline"></span> 130 <span class="md-select-underline"></span>
131 </div> 131 </div>
132 </div> 132 </div>
133 <div id="subpage-trigger" class="settings-box embedded two-line" 133 <div id="subpage-trigger" class="settings-box embedded two-line"
stevenjb 2017/01/11 18:22:52 nit: Could you remove this id also?
malaykeshav 2017/01/11 19:24:17 Done.
134 on-tap="onOverscanTap_" hidden$="[[selectedDisplay.isInternal]]" 134 on-tap="onOverscanTap_" hidden$="[[selectedDisplay.isInternal]]"
135 actionable> 135 actionable>
136 <div class="start"> 136 <div class="start">
137 <div>$i18n{displayOverscanPageTitle}</div> 137 <div>$i18n{displayOverscanPageTitle}</div>
138 <div class="secondary">$i18n{displayOverscanPageText}</div> 138 <div class="secondary">$i18n{displayOverscanPageText}</div>
139 </div> 139 </div>
140 <button class="subpage-arrow" is="paper-icon-button-light"></button> 140 <button class="subpage-arrow" is="paper-icon-button-light"></button>
141 </div> 141 </div>
142 142
143 <settings-display-overscan-dialog id="displayOverscan" 143 <settings-display-overscan-dialog id="displayOverscan"
144 display-id="{{overscanDisplayId}}"> 144 display-id="{{overscanDisplayId}}">
145 </settings-display-overscan-dialog> 145 </settings-display-overscan-dialog>
146 146
147 <div class="settings-box embedded two-line"
148 on-tap="onTouchCalibrationTap_"
149 hidden$="[[!showTouchCalibrationSetting_(selectedDisplay)]]"
150 actionable>
151 <div class="start">
152 <div>$i18n{displayTouchCalibrationTitle}</div>
153 <div class="secondary">$i18n{displayTouchCalibrationText}</div>
154 </div>
155 <button class="subpage-arrow" is="paper-icon-button-light"></button>
156 </div>
147 </div> 157 </div>
148 </template> 158 </template>
149 <script src="display.js"></script> 159 <script src="display.js"></script>
150 </dom-module> 160 </dom-module>
OLDNEW
« no previous file with comments | « chrome/app/settings_strings.grdp ('k') | chrome/browser/resources/settings/device_page/display.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698