OLD | NEW |
---|---|
1 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html"> |
2 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 2 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
3 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_list. html"> | 3 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_list. html"> |
4 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_list_ item.html"> | 4 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_list_ item.html"> |
5 <link rel="import" href="chrome://resources/html/polymer.html"> | 5 <link rel="import" href="chrome://resources/html/polymer.html"> |
6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys-behavior /iron-a11y-keys-behavior.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys-behavior /iron-a11y-keys-behavior.html"> |
7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.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-spinner/paper-spi nner.html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> |
10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> | 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> |
11 <link rel="import" href="/settings_shared_css.html"> | 11 <link rel="import" href="/settings_shared_css.html"> |
12 <link rel="import" href="network_siminfo.html"> | 12 <link rel="import" href="network_siminfo.html"> |
13 | 13 |
14 <dom-module name="network-summary-item"> | 14 <dom-module name="network-summary-item"> |
15 <template> | 15 <template> |
16 <style include="settings-shared"> | 16 <style include="settings-shared"> |
17 paper-spinner { | 17 paper-spinner { |
18 height: 20px; | 18 height: 20px; |
19 margin: 0 var(--settings-box-row-padding); | 19 margin: 0 var(--settings-box-row-padding); |
20 width: 20px; | 20 width: 20px; |
21 } | 21 } |
22 | 22 |
23 network-siminfo { | 23 network-siminfo { |
24 padding: 0 var(--settings-box-row-padding); | 24 padding: 0 var(--settings-box-row-padding); |
25 } | 25 } |
26 | 26 |
27 .button-row { | 27 .button-row { |
28 align-items: center; | 28 align-items: center; |
29 display: flex; | 29 display: flex; |
30 min-height: var(--settings-row-min-height); | 30 min-height: var(--settings-row-min-height); |
31 } | 31 } |
32 | 32 |
33 #buttons { | 33 #buttons { |
34 align-items: center; | 34 align-items: center; |
35 } | 35 } |
36 | 36 |
(...skipping 13 matching lines...) Expand all Loading... | |
50 | 50 |
51 #networkList { | 51 #networkList { |
52 margin: 5px 0 10px; | 52 margin: 5px 0 10px; |
53 max-height: 400px; | 53 max-height: 400px; |
54 } | 54 } |
55 </style> | 55 </style> |
56 <div class="settings-box two-line"> | 56 <div class="settings-box two-line"> |
57 <div id="details" selectable | 57 <div id="details" selectable |
58 no-flex$="[[showSimInfo_(deviceState)]]" | 58 no-flex$="[[showSimInfo_(deviceState)]]" |
59 on-tap="onDetailsTap_" tabindex$="[[getTabIndex_(deviceState)]]"> | 59 on-tap="onDetailsTap_" tabindex$="[[getTabIndex_(deviceState)]]"> |
60 <cr-network-list-item item="[[activeNetworkState]]"> | 60 <cr-network-list-item class="start" item="[[activeNetworkState]]"> |
61 </cr-network-list-item> | 61 </cr-network-list-item> |
62 <paper-spinner active="[[scanningIsActive_(deviceState, expanded_)]]" | 62 <paper-spinner active="[[scanningIsActive_(deviceState, expanded_)]]" |
63 hidden$="[[!scanningIsVisible_(deviceState)]]"> | 63 hidden$="[[!scanningIsVisible_(deviceState)]]"> |
64 </paper-spinner> | 64 </paper-spinner> |
65 <template is="dom-if" if="[[!expandIsVisible_(deviceState, networkStateL ist)]]"> | |
hcarmona
2016/09/20 21:33:57
WiFi, Cellular, and VPN connections have a gear ic
dschuyler
2016/09/23 17:29:18
I've decided to keep this CL focused on non-chrome
| |
66 <iron-icon icon="settings:arrow-drop-up" class="settings-arrow-right"> | |
67 </iron-icon> | |
68 </template> | |
65 </div> | 69 </div> |
66 | 70 |
67 <template is="dom-if" if="[[showSimInfo_(deviceState)]]"> | 71 <template is="dom-if" if="[[showSimInfo_(deviceState)]]"> |
68 <network-siminfo editable class="flex" | 72 <network-siminfo editable class="flex" |
69 network-properties="[[getCellularState_(deviceState)]]" | 73 network-properties="[[getCellularState_(deviceState)]]" |
70 networking-private="[[networkingPrivate]]"> | 74 networking-private="[[networkingPrivate]]"> |
71 </network-siminfo> | 75 </network-siminfo> |
72 </template> | 76 </template> |
73 | 77 |
74 <div> | 78 <div> |
(...skipping 30 matching lines...) Expand all Loading... | |
105 <div class="button-row" actionable on-tap="onKnownNetworksTap_"> | 109 <div class="button-row" actionable on-tap="onKnownNetworksTap_"> |
106 <a is="action-link">$i18n{knownNetworksButton}</a> | 110 <a is="action-link">$i18n{knownNetworksButton}</a> |
107 </div> | 111 </div> |
108 </template> | 112 </template> |
109 </div> | 113 </div> |
110 </iron-collapse> | 114 </iron-collapse> |
111 </template> | 115 </template> |
112 </template> | 116 </template> |
113 <script src="network_summary_item.js"></script> | 117 <script src="network_summary_item.js"></script> |
114 </dom-module> | 118 </dom-module> |
OLD | NEW |