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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/resources/chromeos/emulator/bluetooth_settings.html

Issue 1258783009: Add functionality to Bluetooth settings UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 | « no previous file | chrome/browser/resources/chromeos/emulator/bluetooth_settings.js » ('j') | chrome/browser/resources/chromeos/emulator/bluetooth_settings.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> 1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout.html"> 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout.html">
3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">
6 6
7 <dom-module id="bluetooth-settings"> 7 <dom-module id="bluetooth-settings">
8 <link rel="import" type="css" href="bluetooth_settings.css"> 8 <link rel="import" type="css" href="bluetooth_settings.css">
9 <template> 9 <template>
10 <div class="layout vertical"> 10 <div class="layout vertical">
11 <div class="element-label">{{title}}</div> 11 <div class="element-label">{{title}}</div>
12 <form id="bluetooth-settings-form"> 12 <form id="bluetooth-settings-form">
13 <div class="layout vertical"> 13 <div class="layout vertical">
14 <p> 14 <label>
xiyuan 2015/07/30 17:21:21 Why have this big <label>?
rfrappier 2015/07/30 22:21:38 It was mainly because all this markup is under the
15 <label> 15 <span class="form-label">Devices</span>
16 <span class="form-label">Toggle bluetooth</span> 16 <template is="dom-repeat" items="{{devices}}">
17 <paper-toggle-button 17 <div class="device-container">
18 checked="{{powerToMainAdapter}}"></paper-toggle-button> 18 <div class="bluetooth-device">
19 </label> 19 <div class="element-label">[[item.alias]]</div>
20 </p> 20 <paper-input value="{{item.alias}}"
21 </div> 21 label="Alias"></paper-input>
22 <div class="layout vertical"> 22 <paper-input value="{{item.path}}"
23 <p> 23 label="Path"></paper-input>
24 <label> 24 <paper-input value="{{item.address}}"
25 <span class="form-label">Devices</span> 25 label="Address"></paper-input>
26 <template is="dom-repeat" items="{{devices}}"> 26 <paper-input value="{{item.name}}"
27 <div class="device-container"> 27 label="name"></paper-input>
28 <div class="bluetooth-device"> 28 <span class="toggle-button-label">Trusted</span>
29 <div class="element-label">[[item.name]]</div> 29 <paper-toggle-button
30 <paper-input value="{{item.name}}" 30 checked="{{item.isTrusted}}"></paper-toggle-button>
31 label="Name"></paper-input> 31 <div class="device-field">
xiyuan 2015/07/30 17:21:21 Where is "device-field" defined?
32 <paper-input value="{{item.path}}" 32 <p>
xiyuan 2015/07/30 17:21:21 <p> seems redundant and could be removed. Why do w
rfrappier 2015/07/30 22:21:38 The <p> tags were just there to add a bit of verti
33 label="Path"></paper-input> 33 <label>
34 <paper-input value="{{item.address}}" 34 <span class="form-label">Class/Type</span>
35 label="Address"></paper-input> 35 <paper-radio-group selected="{{item.class}}">
36 <paper-input value="{{item.alias}}" 36 <template is="dom-repeat"
37 label="Alias"></paper-input> 37 items="{{deviceClassOptions}}" as="option"
38 <span class="toggle-button-label">Trusted</span> 38 index-as="option_index">
39 <paper-toggle-button 39 <paper-radio-button name="{{option.text}}"
40 checked="{{item.isTrusted}}"></paper-toggle-button> 40 >{{option.text}}</paper-radio-button>
41 <span class="toggle-button-label">Pairable</span> 41 </template>
42 <paper-toggle-button 42 </paper-radio-group>
43 checked="{{item.isPairable}}"></paper-toggle-button> 43 </label>
44 </p>
45 </div>
46 <div class="device-field">
47 <p>
xiyuan 2015/07/30 17:21:21 same here.
rfrappier 2015/07/30 22:21:38 Acknowledged.
48 <label>
49 <span class="form-label">Pair Authentication Type</span>
50 <paper-radio-group selected="{{item.pairingMethod}}">
51 <template is="dom-repeat"
52 items="{{deviceAuthenticationMethods}}" as="method "
xiyuan 2015/07/30 17:21:21 nit: more than 80 chars, wrap it.
rfrappier 2015/07/30 22:21:38 Acknowledged.
53 index-as="method_index">
54 <paper-radio-button name="{{method}}"
55 >{{method}}</paper-radio-button>
56 </template>
57 </paper-radio-group>
58 </label>
59 </p>
60 </div>
61 <template is="dom-if"
62 if="{{ showAuthToken(item.pairingMethod) }}">
44 <div class="device-field"> 63 <div class="device-field">
45 <p> 64 <p>
46 <label> 65 <paper-input value="{{item.pairingAuthToken}}"
47 <span class="form-label">Class/Type</span> 66 label="Code"></paper-input>
48 <paper-radio-group selected="{{item.class}}">
49 <template is="dom-repeat"
50 items="{{deviceClassOptions}}" as="option"
51 index-as="option_index">
52 <paper-radio-button name="{{option.text}}"
53 >{{option.text}}</paper-radio-button>
54 </template>
55 </paper-radio-group>
56 </label>
57 </p> 67 </p>
58 </div> 68 </div>
59 <div class="device-field"> 69 </template>
60 <p> 70 <paper-button raised class="colored" on-click="pairDevice"
61 <label> 71 data-index="[[index]]">
62 <span class="form-label">Pair Authentication Type</spa n> 72 Pair
63 <paper-radio-group selected="{{item.pairMethod}}"> 73 </paper-button>
64 <template is="dom-repeat" 74 <paper-button raised class="colored"
65 items="{{deviceAuthenticationMethods}}" as="meth od" 75 on-click="discoverDevice" data-index="[[index]]">
66 index-as="method_index"> 76 Make Discoverable
67 <paper-radio-button name="{{method}}" 77 </paper-button>
68 >{{method}}</paper-radio-button>
69 </template>
70 </paper-radio-group>
71 </label>
72 </p>
73 </div>
74 <paper-button raised class="colored" on-click="pairDevice"
75 data-index="[[index]]">
76 Pair
77 </paper-button>
78 <paper-button raised class="colored"
79 on-click="discoverDevice" data-index="[[index]]">
80 Make Discoverable
81 </paper-button>
82 </div>
83 </div> 78 </div>
84 </template> 79 </div>
85 <paper-button on-click="appendNewDevice"> 80 </template>
86 [+] New Device 81 <paper-button on-click="appendNewDevice">
87 </paper-button> 82 [+] New Device
88 </label> 83 </paper-button>
89 </p> 84 </label>
90 </div> 85 </div>
91 </form> 86 </form>
92 </div> 87 </div>
93 </template> 88 </template>
94 <script src="bluetooth_settings.js"></script> 89 <script src="bluetooth_settings.js"></script>
95 </dom-module> 90 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/emulator/bluetooth_settings.js » ('j') | chrome/browser/resources/chromeos/emulator/bluetooth_settings.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698