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

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

Issue 2676103002: MD Settings: Move bluetooth UI from dialog to subpage (Closed)
Patch Set: Feedback Created 3 years, 10 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_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/html/i18n_behavior.html"> 2 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
3 <link rel="import" href="chrome://resources/html/polymer.html"> 3 <link rel="import" href="chrome://resources/html/polymer.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-list/iron-list.htm l"> 5 <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/paper-button/paper-butt on.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">
8 <link rel="import" href="/icons.html"> 8 <link rel="import" href="../icons.html">
9 <link rel="import" href="/settings_shared_css.html"> 9 <link rel="import" href="../settings_shared_css.html">
10 <link rel="import" href="bluetooth_device_dialog.html"> 10 <link rel="import" href="bluetooth_device_dialog.html">
11 <link rel="import" href="bluetooth_device_list_item.html"> 11 <link rel="import" href="bluetooth_device_list_item.html">
12 12
13 <dom-module id="settings-bluetooth-subpage"> 13 <dom-module id="settings-bluetooth-subpage">
14 <template> 14 <template>
15 <style include="settings-shared"> 15 <style include="settings-shared">
16 #container { 16 .container {
17 @apply(--settings-list-frame-padding); 17 @apply(--settings-list-frame-padding);
18 min-height: 100px; 18 min-height: 10px;
19 overflow-y: auto; 19 overflow-y: auto;
20 } 20 }
21 21
22 #pairButton { 22 .header {
23 margin: 0 23 margin-top: 10px;
24 } 24 }
25 25
26 #topRow { 26 paper-spinner {
27 margin-bottom: 10px; 27 @apply(--cr-icon-height-width);
28 } 28 }
29 </style> 29 </style>
30 30
31 <div id="topRow" class="settings-box first"> 31 <div class="settings-box first">
32 <div class="start">[[getOffOnString_(bluetoothEnabled)]]</div> 32 <div class="start">[[getOffOnString_(bluetoothEnabled)]]</div>
33 <paper-button id="pairButton" class="primary-button"
34 on-tap="onAddDeviceTap_" hidden="[[!bluetoothEnabled]]">
35 $i18n{bluetoothPairDevice}
36 </paper-button>
37 <paper-toggle-button id="enableBluetooth" checked="{{bluetoothEnabled}}"> 33 <paper-toggle-button id="enableBluetooth" checked="{{bluetoothEnabled}}">
38 </paper-toggle-button> 34 </paper-toggle-button>
39 </div> 35 </div>
40 36
41 <div id="container" class="layout vertical" 37 <!-- Paired device list -->
38 <div class="settings-box first header" hidden$="[[!bluetoothEnabled]]">
39 <div class="start">$i18n{bluetoothDeviceListPaired}</div>
40 </div>
41 <div id="noPairedDevices" class="list-frame"
42 hidden$="[[!showNoDevices_(bluetoothEnabled, pairedDeviceList_)]]">
43 $i18n{bluetoothNoDevices}
44 </div>
45 <div id="pairedContainer" class="container layout vertical"
42 scrollable on-device-event="onDeviceEvent_" 46 scrollable on-device-event="onDeviceEvent_"
43 hidden="[[!showDevices_(bluetoothEnabled, pairedDeviceList_)]]"> 47 hidden="[[!showDevices_(bluetoothEnabled, pairedDeviceList_)]]">
44 <iron-list id="devices" class="vertical-list" 48 <iron-list id="pairedDevices" class="vertical-list"
45 items="[[pairedDeviceList_]]" 49 items="[[pairedDeviceList_]]"
46 selection-enabled selected-item="{{selectedItem_}}" 50 selection-enabled selected-item="{{selectedPairedItem_}}"
47 scroll-target="container"> 51 scroll-target="pairedContainer">
48 <template> 52 <template>
49 <bluetooth-device-list-item device="[[item]]" 53 <bluetooth-device-list-item device="[[item]]"
50 tabindex$="[[tabIndex]]"> 54 tabindex$="[[tabIndex]]">
51 </bluetooth-device-list-item> 55 </bluetooth-device-list-item>
52 </template> 56 </template>
53 </iron-list> 57 </iron-list>
54 </div> 58 </div>
55 <div id="noDevices" class="settings-box continuation" 59
56 hidden$="[[!showNoDevices_(bluetoothEnabled, pairedDeviceList_)]]"> 60 <!-- Unpaired device list -->
57 $i18n{bluetoothNoDevices} 61 <div class="settings-box first header" hidden$="[[!bluetoothEnabled]]">
62 <div class="start">$i18n{bluetoothDeviceListUnpaired}</div>
63 <paper-spinner active="[[showSpinner_]]">
64 </paper-spinner>
65 </div>
66 <div id="noUnpairedDevices" class="list-frame"
67 hidden$="[[!showNoDevices_(bluetoothEnabled, unpairedDeviceList_)]]">
68 $i18n{bluetoothNoDevicesFound}
69 </div>
70 <div id="unpairedContainer" class="container layout vertical"
71 scrollable on-device-event="onDeviceEvent_"
72 hidden="[[!showDevices_(bluetoothEnabled, unpairedDeviceList_)]]">
73 <iron-list id="unpairedDevices" class="vertical-list"
74 items="[[unpairedDeviceList_]]"
75 selection-enabled selected-item="{{selectedUnpairedItem_}}"
76 scroll-target="unpairedContainer">
77 <template>
78 <bluetooth-device-list-item device="[[item]]"
79 tabindex$="[[tabIndex]]">
80 </bluetooth-device-list-item>
81 </template>
82 </iron-list>
58 </div> 83 </div>
59 84
60 <bluetooth-device-dialog id="deviceDialog" 85 <bluetooth-device-dialog id="deviceDialog"
61 adapter-state="[[adapterState]]"
62 bluetooth-private="[[bluetoothPrivate]]" 86 bluetooth-private="[[bluetoothPrivate]]"
63 device-list="[[deviceList_]]"
64 dialog-id="[[dialogId_]]" 87 dialog-id="[[dialogId_]]"
65 error-message="[[errorMessage_]]" 88 error-message="[[errorMessage_]]"
66 on-close="onDialogClosed_" 89 on-close="onDialogClosed_"
67 on-device-event="onDeviceEvent_" 90 on-device-event="onDeviceEvent_"
68 pairing-device="[[pairingDevice_]]"> 91 pairing-device="[[pairingDevice_]]">
69 </bluetooth-device-dialog> 92 </bluetooth-device-dialog>
70 93
71 </template> 94 </template>
72 <script src="bluetooth_subpage.js"></script> 95 <script src="bluetooth_subpage.js"></script>
73 </dom-module> 96 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698