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

Side by Side Diff: chrome/browser/resources/settings/bluetooth_page/bluetooth_page.html

Issue 1875413002: MD Settings: polish top-level bluetooth page (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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/html/i18n_behavior.html"> 1 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
2 <link rel="import" href="chrome://resources/html/polymer.html"> 2 <link rel="import" href="chrome://resources/html/polymer.html">
3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.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/iron-icons/device-icons .html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/device-icons .html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.htm l"> 6 <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/neon-animation/neon-ani matable.html"> 7 <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/paper-button/paper-butt on.html"> 8 <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-toggle-button/pap er-toggle-button.html"> 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">
10 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html"> 10 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html">
11 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> 11 <link rel="import" href="chrome://md-settings/settings_shared_css.html">
12 <link rel="import" href="bluetooth_device_list_item.html"> 12 <link rel="import" href="bluetooth_device_list_item.html">
13 <link rel="import" href="bluetooth_add_device_dialog.html"> 13 <link rel="import" href="bluetooth_add_device_dialog.html">
14 <link rel="import" href="bluetooth_pair_device_dialog.html"> 14 <link rel="import" href="bluetooth_pair_device_dialog.html">
15 15
16 <dom-module id="settings-bluetooth-page"> 16 <dom-module id="settings-bluetooth-page">
17 <link rel="import" type="css" href="bluetooth_page.css"> 17 <link rel="import" type="css" href="bluetooth_page.css">
18 <template> 18 <template>
19 <style include="settings-shared"></style> 19 <style include="settings-shared">
20 iron-icon[icon="device:bluetooth"] {
21 -webkit-margin-end: var(--iron-icon-spacing);
22 }
23
24 .no-devices {
25 min-height: var(--settings-row-min-height);
26 }
27 </style>
20 <settings-animated-pages id="pages" current-route="{{currentRoute}}" 28 <settings-animated-pages id="pages" current-route="{{currentRoute}}"
21 section="bluetooth"> 29 section="bluetooth">
22 <neon-animatable id="main"> 30 <neon-animatable id="main">
23 <div class="settings-box first"> 31 <div class="settings-box first">
24 <div class="layout horizontal center"> 32 <div class="layout horizontal center flex">
Dan Beam 2016/04/12 04:28:14 class="flex" fixes toggle position
25 <iron-icon icon="device:bluetooth"></iron-icon> 33 <iron-icon icon="device:bluetooth"></iron-icon>
26 <span class="flex" i18n-content="bluetoothEnable"></span> 34 <span class="flex" i18n-content="bluetoothEnable"></span>
27 <cr-expand-button id="expandListButton" 35 <cr-expand-button id="expandListButton"
28 hidden$="[[!bluetoothEnabled]]" 36 hidden$="[[!bluetoothEnabled]]"
29 expanded="{{deviceListExpanded}}"> 37 expanded="{{deviceListExpanded}}">
30 </cr-expand-button> 38 </cr-expand-button>
31 <paper-toggle-button id="enableBluetooth" 39 <paper-toggle-button id="enableBluetooth"
32 checked="{{bluetoothEnabled}}" 40 checked="{{bluetoothEnabled}}"
33 on-change="onBluetoothEnabledChange_"> 41 on-change="onBluetoothEnabledChange_">
34 </paper-toggle-button> 42 </paper-toggle-button>
35 </div> 43 </div>
36 <iron-collapse opened="[[deviceListExpanded]]"> 44 </div>
37 <div id="deviceList" class="layout vertical" 45 <iron-collapse opened="[[canShowDeviceList_(bluetoothEnabled, deviceList Expanded)]]">
Dan Beam 2016/04/12 04:28:14 if the list was open and the toggle disabled bluet
stevenjb 2016/04/12 15:58:48 Michael has proposed splitting long computed prope
Dan Beam 2016/04/12 19:51:02 Done.
38 on-device-event="onDeviceEvent_"> 46 <div id="deviceList" class="list-frame vertical-list"
39 <span class="no-devices" 47 on-device-event="onDeviceEvent_">
40 hidden$="[[haveDevices_(deviceList.splices)]]" 48 <template is="dom-repeat" items="[[deviceList]]"
41 i18n-content="bluetoothNoDevices"> 49 filter="deviceIsPairedOrConnecting_">
42 </span> 50 <bluetooth-device-list-item device="[[item]]" class="list-item">
43 <template is="dom-repeat" items="[[deviceList]]" 51 </bluetooth-device-list-item>
44 filter="deviceIsPairedOrConnecting_"> 52 </template>
45 <bluetooth-device-list-item device="[[item]]"> 53 <div class="no-devices layout horizontal center"
46 </bluetooth-device-list-item> 54 hidden$="[[haveDevices_(deviceList.splices)]]"
47 </template> 55 i18n-content="bluetoothNoDevices">
48 </div> 56 </div>
49 <div class="settings-box" hidden$="[[!bluetoothEnabled]]"> 57 </div>
50 <paper-button id="addDevice" i18n-content="bluetoothAddDevice" 58 <div class="settings-box" hidden$="[[!bluetoothEnabled]]">
51 on-tap="onAddDeviceTap_"> 59 <paper-button i18n-content="bluetoothAddDevice"
52 </paper-button> 60 class="primary-button" on-tap="onAddDeviceTap_">
53 </div> 61 </paper-button>
54 </iron-collapse> 62 </div>
55 </div> 63 </iron-collapse>
56 </neon-animatable> 64 </neon-animatable>
57 </settings-animated-pages> 65 </settings-animated-pages>
58 66
59 <paper-dialog modal id="deviceDialog" class="layout vertical" 67 <paper-dialog modal id="deviceDialog" class="layout vertical"
60 on-iron-overlay-opened="onDialogOpened_" 68 on-iron-overlay-opened="onDialogOpened_"
61 on-iron-overlay-closed="onDialogClosed_"> 69 on-iron-overlay-closed="onDialogClosed_">
62 <template is="dom-if" if="[[dialogIsVisible_(dialog, 'addDevice')]]" 70 <template is="dom-if" if="[[dialogIsVisible_(dialog, 'addDevice')]]"
63 restamp> 71 restamp>
64 <settings-bluetooth-add-device-dialog 72 <settings-bluetooth-add-device-dialog
65 class="layout vertical flex" 73 class="layout vertical flex"
(...skipping 11 matching lines...) Expand all
77 pairing-event="[[pairingEvent]]" 85 pairing-event="[[pairingEvent]]"
78 on-response="onResponse_" 86 on-response="onResponse_"
79 on-close-dialog="onCloseDialog_"> 87 on-close-dialog="onCloseDialog_">
80 </settings-bluetooth-pair-device-dialog> 88 </settings-bluetooth-pair-device-dialog>
81 </template> 89 </template>
82 </paper-dialog> 90 </paper-dialog>
83 91
84 </template> 92 </template>
85 <script src="bluetooth_page.js"></script> 93 <script src="bluetooth_page.js"></script>
86 </dom-module> 94 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698