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/network/cr_network_list.
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_
item.html"> | 4 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_list_
item.html"> |
4 <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"> |
5 <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"> |
6 <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"> |
7 <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"> |
8 <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"> |
9 <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"> |
10 | 13 |
11 <dom-module name="network-summary-item"> | 14 <dom-module name="network-summary-item"> |
12 <template> | 15 <template> |
13 <style include="settings-shared"> | 16 <style include="settings-shared"> |
14 paper-spinner { | 17 paper-spinner { |
15 height: 20px; | 18 height: 20px; |
16 margin: 0 20px; | 19 margin: 0 var(--settings-box-row-padding); |
17 width: 20px; | 20 width: 20px; |
18 } | 21 } |
19 | 22 |
| 23 network-siminfo { |
| 24 padding: 0 var(--settings-box-row-padding); |
| 25 } |
| 26 |
20 .button-row { | 27 .button-row { |
21 align-items: center; | 28 align-items: center; |
22 display: flex; | 29 display: flex; |
23 min-height: var(--settings-row-min-height); | 30 min-height: var(--settings-row-min-height); |
24 } | 31 } |
25 | 32 |
26 #buttons { | 33 #buttons { |
27 align-items: center; | 34 align-items: center; |
28 } | 35 } |
29 | 36 |
| 37 #details { |
| 38 align-items: center; |
| 39 display: flex; |
| 40 flex: auto; |
| 41 } |
| 42 |
| 43 #details[no-flex] { |
| 44 flex: none; |
| 45 } |
| 46 |
30 #deviceEnabledButton { | 47 #deviceEnabledButton { |
31 -webkit-margin-start: 10px; | 48 -webkit-margin-start: 10px; |
32 } | 49 } |
33 | 50 |
34 #networkList { | 51 #networkList { |
35 margin: 5px 0 10px; | 52 margin: 5px 0 10px; |
36 max-height: 400px; | 53 max-height: 400px; |
37 } | 54 } |
38 </style> | 55 </style> |
39 <div class="settings-box two-line"> | 56 <div class="settings-box two-line"> |
40 <div id="details" actionable class="start layout horizontal center" | 57 <div id="details" selectable |
41 on-tap="onDetailsTap_"> | 58 no-flex$="[[showSimInfo_(deviceState)]]" |
42 <cr-network-list-item class="flex" item="[[activeNetworkState]]"> | 59 on-tap="onDetailsTap_" tabindex$="[[getTabIndex_(deviceState)]]"> |
| 60 <cr-network-list-item item="[[activeNetworkState]]"> |
43 </cr-network-list-item> | 61 </cr-network-list-item> |
44 <paper-spinner active="[[showScanning_(deviceState, expanded_)]]"> | 62 <paper-spinner active="[[scanningIsActive_(deviceState, expanded_)]]" |
| 63 hidden$="[[!scanningIsVisible_(deviceState)]]"> |
45 </paper-spinner> | 64 </paper-spinner> |
46 </div> | 65 </div> |
| 66 |
| 67 <template is="dom-if" if="[[showSimInfo_(deviceState)]]"> |
| 68 <network-siminfo editable class="flex" |
| 69 network-properties="[[getCellularState_(deviceState)]]" |
| 70 networking-private="[[networkingPrivate]]"> |
| 71 </network-siminfo> |
| 72 </template> |
| 73 |
47 <div> | 74 <div> |
48 <div id="buttons" class="layout horizontal"> | 75 <div id="buttons" class="layout horizontal"> |
49 <template is="dom-if" | 76 <template is="dom-if" |
| 77 if="[[showDetailsIsVisible_(deviceState, networkStateList)]]"> |
| 78 <paper-icon-button icon="cr:settings" on-tap="onShowDetailsTap_"> |
| 79 </paper-icon-button> |
| 80 </template> |
| 81 <template is="dom-if" |
50 if="[[expandIsVisible_(deviceState, networkStateList)]]"> | 82 if="[[expandIsVisible_(deviceState, networkStateList)]]"> |
51 <cr-expand-button id="expandListButton" expanded="{{expanded_}}"> | 83 <cr-expand-button id="expandListButton" expanded="{{expanded_}}"> |
52 </cr-expand-button> | 84 </cr-expand-button> |
53 </template> | 85 </template> |
54 <template is="dom-if" if="[[enableIsVisible_(deviceState)]]"> | 86 <template is="dom-if" if="[[enableIsVisible_(deviceState)]]"> |
55 <paper-toggle-button id="deviceEnabledButton" | 87 <paper-toggle-button id="deviceEnabledButton" |
56 checked="[[deviceIsEnabled_(deviceState)]]" | 88 checked="[[deviceIsEnabled_(deviceState)]]" |
57 on-tap="onDeviceEnabledTap_"> | 89 on-tap="onDeviceEnabledTap_"> |
58 </paper-toggle-button> | 90 </paper-toggle-button> |
59 </template> | 91 </template> |
(...skipping 13 matching lines...) Expand all Loading... |
73 <div class="button-row" actionable on-tap="onKnownNetworksTap_"> | 105 <div class="button-row" actionable on-tap="onKnownNetworksTap_"> |
74 <a is="action-link">$i18n{knownNetworksButton}</a> | 106 <a is="action-link">$i18n{knownNetworksButton}</a> |
75 </div> | 107 </div> |
76 </template> | 108 </template> |
77 </div> | 109 </div> |
78 </iron-collapse> | 110 </iron-collapse> |
79 </template> | 111 </template> |
80 </template> | 112 </template> |
81 <script src="network_summary_item.js"></script> | 113 <script src="network_summary_item.js"></script> |
82 </dom-module> | 114 </dom-module> |
OLD | NEW |