Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.h tml"> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.h tml"> |
| 2 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html"> | 2 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html"> |
| 3 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 3 <link rel="import" href="chrome://resources/html/i18n_behavior.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-collapse/iron-coll apse.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> |
| 6 <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/iron-flex-layout/classe s/iron-flex-layout.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.htm l"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.htm l"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
| 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 24 matching lines...) Expand all Loading... | |
| 35 height: 400px; | 35 height: 400px; |
| 36 padding: 0; | 36 padding: 0; |
| 37 width: 500px; | 37 width: 500px; |
| 38 } | 38 } |
| 39 </style> | 39 </style> |
| 40 <settings-animated-pages id="pages" section="bluetooth"> | 40 <settings-animated-pages id="pages" section="bluetooth"> |
| 41 <neon-animatable route-path="default"> | 41 <neon-animatable route-path="default"> |
| 42 <div class="settings-box first" actionable | 42 <div class="settings-box first" actionable |
| 43 on-tap="toggleDeviceListExpanded_"> | 43 on-tap="toggleDeviceListExpanded_"> |
| 44 <div class="start layout horizontal"> | 44 <div class="start layout horizontal"> |
| 45 <iron-icon icon="settings:bluetooth"></iron-icon> | 45 <iron-icon icon="[[getIcon_(bluetoothEnabled_, deviceConnected_)]]"> |
| 46 <span class="middle flex">$i18n{bluetoothEnable}</span> | 46 </iron-icon> |
| 47 <span class="middle flex">[[getTitle_(bluetoothEnabled_)]]</span> | |
|
dschuyler
2016/12/13 00:54:43
IIUC, when the toggle changes, the text for the to
stevenjb
2016/12/13 19:22:36
See the associated bug, filed by our UX designer :
| |
| 47 <cr-policy-pref-indicator | 48 <cr-policy-pref-indicator |
| 48 pref="[[prefs.cros.device.allow_bluetooth]]" | 49 pref="[[prefs.cros.device.allow_bluetooth]]" |
| 49 hidden="[[prefs.cros.device.allow_bluetooth.value]]"> | 50 hidden="[[prefs.cros.device.allow_bluetooth.value]]"> |
| 50 </cr-policy-pref-indicator> | 51 </cr-policy-pref-indicator> |
| 51 <cr-expand-button id="expandListButton" | 52 <cr-expand-button id="expandListButton" |
| 52 alt="$i18n{bluetoothExpandA11yLabel}" | 53 alt="$i18n{bluetoothExpandA11yLabel}" |
| 53 hidden$="[[!bluetoothEnabled_]]" | 54 hidden$="[[!bluetoothEnabled_]]" |
| 54 expanded="{{deviceListExpanded_}}"> | 55 expanded="{{deviceListExpanded_}}"> |
| 55 </cr-expand-button> | 56 </cr-expand-button> |
| 56 </div> | 57 </div> |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 102 on-device-event="onDeviceEvent_" | 103 on-device-event="onDeviceEvent_" |
| 103 on-response="onResponse_" | 104 on-response="onResponse_" |
| 104 pairing-device="[[pairingDevice_]]" | 105 pairing-device="[[pairingDevice_]]" |
| 105 pairing-event="[[pairingEvent_]]"> | 106 pairing-event="[[pairingEvent_]]"> |
| 106 </bluetooth-device-dialog> | 107 </bluetooth-device-dialog> |
| 107 </template> | 108 </template> |
| 108 | 109 |
| 109 </template> | 110 </template> |
| 110 <script src="bluetooth_page.js"></script> | 111 <script src="bluetooth_page.js"></script> |
| 111 </dom-module> | 112 </dom-module> |
| OLD | NEW |