chrome/browser/resources/settings/bluetooth_page/bluetooth_device_dialog.html - Issue 1954383002: MD Settings: combine bluetooth adding and pairing dialogs into one

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

Issue 1954383002: MD Settings: combine bluetooth adding and pairing dialogs into one (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: tests Created 4 years, 7 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

« no previous file with comments | « chrome/browser/resources/settings/bluetooth_page/bluetooth_add_device_dialog.js ('k') | chrome/browser/resources/settings/bluetooth_page/bluetooth_device_dialog.js » ('j') | chrome/browser/resources/settings/bluetooth_page/bluetooth_device_dialog.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
(Empty)
	1 <link rel="import" href="chrome://md-settings/bluetooth_page/bluetooth_device_li st_item.html">

	2 <link rel="import" href="chrome://md-settings/settings_dialog.html">

	3 <link rel="import" href="chrome://resources/polymer/paper-button/paper-button.ht ml">

	4 <link rel="import" href="chrome://resources/polymer/paper-input/paper-input.html ">

	5 <link rel="import" href="chrome://md-settings/bluetooth_page/bluetooth_dialog_sh ared_css.html">

	6

	7 <dom-module id="bluetooth-device-dialog">

	8 <template>

	9 <style include="settings-shared bluetooth-dialog-shared"></style>

	10 <settings-dialog id="dialog" class="layout vertical">

	11 <!-- TODO(dbeam): use .title instead. -->

	12 <div class="body">

	13 <template is="dom-if" if="[[isDialog_(dialog, 'addDevice')]]">

	14

	15 <div id="dialogHeaderDiv" class="settings-box layout horizontal">

	16 <span id="dialogTitle" class="flex">

	17 $i18n{bluetoothAddDevicePageTitle}

	18 </span>

	19 <paper-icon-button icon="close" on-tap="onAddCancelTap_"

	20 id="closeAdd">

	21 </paper-icon-button>

	22 </div>
	stevenjb 2016/05/09 16:58:10 This bit really seems like it ought to be shared b This bit really seems like it ought to be shared between the dialogs if we are going to glom them into a single html file. Dan Beam 2016/05/10 23:55:22 it will be (<settings-dialog> has its own) Show quoted text On 2016/05/09 16:58:10, stevenjb wrote: > This bit really seems like it ought to be shared between the dialogs if we are > going to glom them into a single html file. > it will be (<settings-dialog> has its own) stevenjb 2016/05/11 16:30:07 Acknowledged. Show quoted text On 2016/05/10 23:55:22, Dan Beam wrote: > On 2016/05/09 16:58:10, stevenjb wrote: > > This bit really seems like it ought to be shared between the dialogs if we are > > going to glom them into a single html file. > > > > it will be (<settings-dialog> has its own) Acknowledged.
	23 <div class="settings-box flex">

	24 <div id="dialogDeviceList" class="settings-box layout vertical"

	25 on-device-event="onDeviceEvent_">

	26 <span class="no-devices" hidden$="[[haveDevices_(deviceList)]]">

	27 $i18n{bluetoothNoDevices}

	28 </span>

	29 <iron-selector class="flex">

	30 <template is="dom-repeat" items="[[deviceList]]"

	31 filter="deviceNotPaired_" observe="paired">

	32 <bluetooth-device-list-item device="[[item]]">

	33 </bluetooth-device-list-item>

	34 </template>

	35 </iron-selector>

	36 </div>

	37 </div>

	38

	39 </template>

	40 <template is="dom-if" if="[[isDialog_(dialog, 'pairDevice')]]">

	41

	42 <div id="dialogHeaderDiv" class="settings-box layout horizontal center ">

	43 <span id="dialogTitle" class="flex">

	44 $i18n{bluetoothPairDevicePageTitle}

	45 </span>

	46 <paper-icon-button icon="close" on-tap="onPairCancelTap_"

	47 id="closePair">

	48 </paper-icon-button>

	49 </div>

	50 <div id="pairing"

	51 class="settings-blox layout vertical center center-justified flex" >
	stevenjb 2016/05/09 16:58:10 Are we enforcing 80 cols in the html? Are we enforcing 80 cols in the html? Dan Beam 2016/05/10 23:55:22 Done. Show quoted text On 2016/05/09 16:58:10, stevenjb wrote: > Are we enforcing 80 cols in the html? Done.
	52 <div id="dialogMessage">

	53 [[getMessage_(pairingDevice, pairingEvent)]]

	54 </div>

	55 <div hidden$="[[!showEnterPincode_(pairingEvent)]]">

	56 <paper-input id="pincode" minlength="1" maxlength="16" type="text" >

	57 </div>

	58 <div hidden$="[[!showEnterPasskey_(pairingEvent)]]">

	59 <paper-input id="passkey" minlength="6" maxlength="6" type="text">

	60 </div>

	61 <div id="pinDiv" class="layout horizontal center center-justified"

	62 hidden="[[!showDisplayPassOrPin_(pairingEvent)]]">

	63 <template is="dom-repeat" items="[[digits]]">

	64 <span class$="[[getPinClass_(pairingEvent, index)]]">

	65 [[getPinDigit_(pairingEvent, index)]]

	66 </span>

	67 </template>

	68 <span class$="[[getPinClass_(pairingEvent, -1)]]"

	69 hidden="[[showAcceptReject_(pairingEvent)]]">

	70 $i18n{bluetoothEnterKey}

	71 </span>

	72 </div>

	73 </div>

	74

	75 </template>

	76 </div>

	77 <div class="button-container">

	78 <template is="dom-if" if="[[isDialog_(dialog, 'addDevice')]]">

	79

	80 <div id="scanning" class="layout horizontal center flex"

	81 hidden$="[[!adapterState.discovering]]">

	82 <paper-spinner active="[[adapterState.discovering]]">

	83 </paper-spinner>

	84 <span>$i18n{bluetoothScanning}</span>

	85 </div>

	86 <paper-button id="cancel" class="end-justified" on-tap="onAddCancelTap _">

	87 $i18n{cancel}

	88 </paper-button>

	89

	90 </template>

	91 <template is="dom-if" if="[[isDialog_(dialog, 'pairDevice')]]">

	92

	93 <paper-button hidden$="[[!showAcceptReject_(pairingEvent)]]"

	94 on-tap="onAcceptTap_">$i18n{bluetoothAccept}</paper-button>

	95 <paper-button hidden$="[[!showAcceptReject_(pairingEvent)]]"

	96 on-tap="onRejectTap_">$i18n{bluetoothReject}</paper-button>

	97 <paper-button hidden$="[[!showConnect_(pairingEvent)]]"

	98 on-tap="onConnectTap_">$i18n{bluetoothConnect}</paper-button>

	99 <paper-button hidden$="[[!showDismiss_(pairingDevice, pairingEvent)]]"

	100 on-tap="onDismissTap_">$i18n{bluetoothDismiss}</paper-button>

	101 <paper-button on-tap="onPairCancelTap_"

	102 hidden$="[[showDismiss_(pairingDevice, pairingEvent)]]">

	103 $i18n{cancel}

	104 </paper-button>

	105

	106 </template>

	107 </div>

	108 </settings-dialog>

	109 </template>

	110 <script src="chrome://md-settings/bluetooth_page/bluetooth_device_dialog.js">< /script>

	111 </dom-module>

OLD	NEW