Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 1 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 2 <link rel="import" href="chrome://resources/html/md_select_css.html"> | |
| 2 <link rel="import" href="chrome://resources/html/polymer.html"> | 3 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 4 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.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-icon-button/paper -icon-button-light.html"> |
| 7 <link rel="import" href="/device_page/device_page_browser_proxy.html"> | 8 <link rel="import" href="/device_page/device_page_browser_proxy.html"> |
| 8 <link rel="import" href="/device_page/display.html"> | 9 <link rel="import" href="/device_page/display.html"> |
| 9 <link rel="import" href="/device_page/keyboard.html"> | 10 <link rel="import" href="/device_page/keyboard.html"> |
| 10 <link rel="import" href="/device_page/pointers.html"> | 11 <link rel="import" href="/device_page/pointers.html"> |
| 11 <link rel="import" href="/device_page/storage.html"> | 12 <link rel="import" href="/device_page/storage.html"> |
| 12 <link rel="import" href="/device_page/stylus.html"> | 13 <link rel="import" href="/device_page/stylus.html"> |
| 13 <link rel="import" href="/icons.html"> | 14 <link rel="import" href="/icons.html"> |
| 14 <link rel="import" href="/prefs/prefs.html"> | 15 <link rel="import" href="/prefs/prefs.html"> |
| 15 <link rel="import" href="/route.html"> | 16 <link rel="import" href="/route.html"> |
| 16 <link rel="import" href="/settings_page/settings_animated_pages.html"> | 17 <link rel="import" href="/settings_page/settings_animated_pages.html"> |
| 17 <link rel="import" href="/settings_page/settings_subpage.html"> | 18 <link rel="import" href="/settings_page/settings_subpage.html"> |
| 18 <link rel="import" href="/settings_shared_css.html"> | 19 <link rel="import" href="/settings_shared_css.html"> |
| 19 | 20 |
| 20 <dom-module id="settings-device-page"> | 21 <dom-module id="settings-device-page"> |
| 21 <template> | 22 <template> |
| 22 <style include="settings-shared"></style> | 23 <style include="settings-shared md-select"></style> |
| 23 <settings-animated-pages id="pages" section="device"> | 24 <settings-animated-pages id="pages" section="device"> |
| 24 <neon-animatable id="main" route-path="default"> | 25 <neon-animatable id="main" route-path="default"> |
| 25 <div id="pointersRow" class="settings-box first" | 26 <div id="pointersRow" class="settings-box first" |
| 26 on-tap="onPointersTap_" actionable> | 27 on-tap="onPointersTap_" actionable> |
| 27 <iron-icon icon="[[getPointersIcon_(hasMouse_, hasTouchpad_)]]"> | 28 <iron-icon icon="[[getPointersIcon_(hasMouse_, hasTouchpad_)]]"> |
| 28 </iron-icon> | 29 </iron-icon> |
| 29 <div class="middle"> | 30 <div class="middle"> |
| 30 [[getPointersTitle_(hasMouse_, hasTouchpad_)]] | 31 [[getPointersTitle_(hasMouse_, hasTouchpad_)]] |
| 31 </div> | 32 </div> |
| 32 <button class="subpage-arrow" is="paper-icon-button-light"></button> | 33 <button class="subpage-arrow" is="paper-icon-button-light"></button> |
| (...skipping 17 matching lines...) Expand all Loading... | |
| 50 <iron-icon icon="settings:desktop-windows"></iron-icon> | 51 <iron-icon icon="settings:desktop-windows"></iron-icon> |
| 51 <div class="middle">$i18n{displayTitle}</div> | 52 <div class="middle">$i18n{displayTitle}</div> |
| 52 <button class="subpage-arrow" is="paper-icon-button-light"></button> | 53 <button class="subpage-arrow" is="paper-icon-button-light"></button> |
| 53 </div> | 54 </div> |
| 54 <div id="storageRow" class="settings-box" on-tap="onStorageTap_" | 55 <div id="storageRow" class="settings-box" on-tap="onStorageTap_" |
| 55 actionable> | 56 actionable> |
| 56 <iron-icon icon="settings:storage"></iron-icon> | 57 <iron-icon icon="settings:storage"></iron-icon> |
| 57 <div class="middle">$i18n{storageTitle}</div> | 58 <div class="middle">$i18n{storageTitle}</div> |
| 58 <button class="subpage-arrow" is="paper-icon-button-light"></button> | 59 <button class="subpage-arrow" is="paper-icon-button-light"></button> |
| 59 </div> | 60 </div> |
| 61 <template is="dom-if" if="[[enablePowerSettings_]]"> | |
| 62 <div id="powerRow" class="settings-box two-line"> | |
| 63 <iron-icon icon="[[batteryIcon_]]"></iron-icon> | |
| 64 <div class="middle"> | |
| 65 <div>[[powerLabel_]]</div> | |
| 66 <div class="secondary">[[batteryStatus_.statusText]]</div> | |
| 67 </div> | |
| 68 <div class="md-select-wrapper" | |
| 69 hidden$="[[!showPowerDropdown_]]"> | |
| 70 <select id="powerSource" class="md-select" | |
| 71 on-change="onPowerSourceChange_"> | |
| 72 <option value="" | |
| 73 selected$="[[isEqual_('', selectedPowerSourceId_)]]"> | |
|
stevenjb
2017/01/13 17:22:42
nit: Can we easily use a descriptive value for bat
Daniel Erat
2017/01/13 17:44:54
the IDs are opaque strings that come from powerd.
stevenjb
2017/01/13 18:03:41
OK, that makes sense.
| |
| 74 $i18n{powerSourceBattery} | |
| 75 </option> | |
| 76 <template is="dom-repeat" items="[[powerSources_]]"> | |
| 77 <option value="[[item.id]]" | |
| 78 selected$="[[isEqual_(item.id, selectedPowerSourceId_)]]"> | |
| 79 [[item.description]] | |
| 80 </option> | |
| 81 </template> | |
| 82 </select> | |
| 83 <span class="md-select-underline"></span> | |
| 84 </div> | |
| 85 <div hidden$="[[showPowerDropdown_]]"> | |
| 86 [[powerSourceName_]] | |
| 87 </div> | |
| 88 </div> | |
| 89 </template> | |
| 60 </neon-animatable> | 90 </neon-animatable> |
| 61 <template is="dom-if" route-path="/pointer-overlay"> | 91 <template is="dom-if" route-path="/pointer-overlay"> |
| 62 <settings-subpage | 92 <settings-subpage |
| 63 associated-control="[[$$('#pointersRow')]]" | 93 associated-control="[[$$('#pointersRow')]]" |
| 64 page-title="[[getPointersTitle_(hasMouse_, hasTouchpad_)]]"> | 94 page-title="[[getPointersTitle_(hasMouse_, hasTouchpad_)]]"> |
| 65 <settings-pointers prefs="{{prefs}}" | 95 <settings-pointers prefs="{{prefs}}" |
| 66 has-mouse="[[hasMouse_]]" has-touchpad="[[hasTouchpad_]]"> | 96 has-mouse="[[hasMouse_]]" has-touchpad="[[hasTouchpad_]]"> |
| 67 </settings-pointers> | 97 </settings-pointers> |
| 68 </settings-subpage> | 98 </settings-subpage> |
| 69 </template> | 99 </template> |
| (...skipping 24 matching lines...) Expand all Loading... | |
| 94 <settings-subpage | 124 <settings-subpage |
| 95 associated-control="[[$$('#storageRow')]]" | 125 associated-control="[[$$('#storageRow')]]" |
| 96 page-title="$i18n{storageTitle}"> | 126 page-title="$i18n{storageTitle}"> |
| 97 <settings-storage></settings-storage> | 127 <settings-storage></settings-storage> |
| 98 </settings-subpage> | 128 </settings-subpage> |
| 99 </template> | 129 </template> |
| 100 </settings-animated-pages> | 130 </settings-animated-pages> |
| 101 </template> | 131 </template> |
| 102 <script src="device_page.js"></script> | 132 <script src="device_page.js"></script> |
| 103 </dom-module> | 133 </dom-module> |
| OLD | NEW |