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/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-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/neon-animation/neon-ani matable.html"> | 6 <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/paper-button/paper-butt on.html"> | 7 <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-toggle-button/pap er-toggle-button.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> |
9 <link rel="import" href="/icons.html"> | 9 <link rel="import" href="/icons.html"> |
10 <link rel="import" href="/settings_page/settings_animated_pages.html"> | 10 <link rel="import" href="/settings_page/settings_animated_pages.html"> |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
45 <div class="settings-box first"> | 45 <div class="settings-box first"> |
46 <div class="layout horizontal center flex"> | 46 <div class="layout horizontal center flex"> |
47 <iron-icon icon="settings:bluetooth"></iron-icon> | 47 <iron-icon icon="settings:bluetooth"></iron-icon> |
48 <span class="flex">$i18n{bluetoothEnable}</span> | 48 <span class="flex">$i18n{bluetoothEnable}</span> |
49 <cr-expand-button id="expandListButton" | 49 <cr-expand-button id="expandListButton" |
50 hidden$="[[!bluetoothEnabled]]" | 50 hidden$="[[!bluetoothEnabled]]" |
51 expanded="{{deviceListExpanded}}"> | 51 expanded="{{deviceListExpanded}}"> |
52 </cr-expand-button> | 52 </cr-expand-button> |
53 <paper-toggle-button id="enableBluetooth" | 53 <paper-toggle-button id="enableBluetooth" |
54 checked="{{bluetoothEnabled}}" | 54 checked="{{bluetoothEnabled}}" |
55 on-change="onBluetoothEnabledChange_"> | 55 disabled="[[!adapterState.available]]" |
56 on-change="onBluetoothEnabledChange_" actionable> | |
Dan Beam
2016/07/13 02:21:46
i think we should make all paper-toggle-buttons ac
stevenjb
2016/07/13 17:12:24
Will do that separately, removed change from here.
| |
56 </paper-toggle-button> | 57 </paper-toggle-button> |
57 </div> | 58 </div> |
58 </div> | 59 </div> |
59 <iron-collapse opened="[[canShowDeviceList_(bluetoothEnabled, | 60 <iron-collapse opened="[[canShowDeviceList_(bluetoothEnabled, |
60 deviceListExpanded)]]"> | 61 deviceListExpanded)]]"> |
61 <div id="deviceList" class="list-frame vertical-list" | 62 <div id="deviceList" class="list-frame vertical-list" |
62 on-device-event="onDeviceEvent_"> | 63 on-device-event="onDeviceEvent_"> |
63 <template is="dom-repeat" items="[[deviceList]]" | 64 <template is="dom-repeat" items="[[deviceList]]" |
64 filter="deviceIsPairedOrConnecting_"> | 65 filter="deviceIsPairedOrConnecting_"> |
65 <bluetooth-device-list-item device="[[item]]" class="list-item"> | 66 <bluetooth-device-list-item device="[[item]]" class="list-item"> |
66 </bluetooth-device-list-item> | 67 </bluetooth-device-list-item> |
67 </template> | 68 </template> |
68 <div class="no-devices layout horizontal center" | 69 <div class="no-devices layout horizontal center" |
69 hidden$="[[haveDevices_(deviceList.splices)]]"> | 70 hidden$="[[haveDevices_(deviceList.splices)]]"> |
70 $i18n{bluetoothNoDevices} | 71 $i18n{bluetoothNoDevices} |
71 </div> | 72 </div> |
72 </div> | 73 </div> |
73 <div class="settings-box" hidden$="[[!bluetoothEnabled]]"> | 74 <div class="settings-box" hidden$="[[!bluetoothEnabled]]"> |
74 <paper-button class="primary-button" on-tap="onAddDeviceTap_"> | 75 <paper-button class="primary-button" on-tap="onAddDeviceTap_"> |
75 $i18n{bluetoothAddDevice} | 76 $i18n{bluetoothAddDevice} |
76 </paper-button> | 77 </paper-button> |
77 </div> | 78 </div> |
78 </iron-collapse> | 79 </iron-collapse> |
79 </neon-animatable> | 80 </neon-animatable> |
80 </settings-animated-pages> | 81 </settings-animated-pages> |
81 | 82 |
82 <bluetooth-device-dialog id="deviceDialog" | 83 <bluetooth-device-dialog id="deviceDialog" |
83 adapter-state="[[adapterState]]" | 84 adapter-state="[[adapterState]]" |
84 device-list="[[deviceList]]" | 85 device-list="[[deviceList]]" |
85 dialog-type="[[dialog]]" | 86 dialog-id="[[dialogId]]" |
86 on-close-dialog="onCloseDialog_" | 87 on-close-dialog="onCloseDialog_" |
87 on-device-event="onDeviceEvent_" | 88 on-device-event="onDeviceEvent_" |
88 on-iron-overlay-closed="onDialogClosed_" | 89 on-iron-overlay-closed="onDialogClosed_" |
89 on-iron-overlay-opened="onDialogOpened_" | 90 on-iron-overlay-opened="onDialogOpened_" |
90 on-response="onResponse_" | 91 on-response="onResponse_" |
91 pairing-device="[[pairingDevice]]" | 92 pairing-device="[[pairingDevice]]" |
92 pairing-event="[[pairingEvent]]"> | 93 pairing-event="[[pairingEvent]]"> |
93 </bluetooth-device-dialog> | 94 </bluetooth-device-dialog> |
94 | 95 |
95 </template> | 96 </template> |
96 <script src="bluetooth_page.js"></script> | 97 <script src="bluetooth_page.js"></script> |
97 </dom-module> | 98 </dom-module> |
OLD | NEW |