Index: chrome/browser/resources/settings/internet_page/network_summary_item.html |
diff --git a/chrome/browser/resources/settings/internet_page/network_summary_item.html b/chrome/browser/resources/settings/internet_page/network_summary_item.html |
index d77caf0e238cb956324a0980e4297c470e73dfd4..64c43a9211dfab4d09a61e15d72b6c3e291c6515 100644 |
--- a/chrome/browser/resources/settings/internet_page/network_summary_item.html |
+++ b/chrome/browser/resources/settings/internet_page/network_summary_item.html |
@@ -2,11 +2,13 @@ |
<link rel="import" href="chrome://resources/cr_elements/network/cr_network_list.html"> |
<link rel="import" href="chrome://resources/cr_elements/network/cr_network_list_item.html"> |
<link rel="import" href="chrome://resources/html/polymer.html"> |
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys-behavior/iron-a11y-keys-behavior.html"> |
<link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-collapse.html"> |
<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html"> |
<link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spinner.html"> |
<link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/paper-toggle-button.html"> |
<link rel="import" href="/settings_shared_css.html"> |
+<link rel="import" href="network_siminfo.html"> |
<dom-module name="network-summary-item"> |
<template> |
@@ -27,6 +29,10 @@ |
align-items: center; |
} |
+ #details[noflex] { |
michaelpg
2016/09/06 21:10:38
nit: no-flex (2 words)
stevenjb
2016/09/12 19:46:42
Done.
|
+ flex: 0; |
michaelpg
2016/09/06 21:10:38
should this be "flex: none" (for flex-shrink: 0)?
stevenjb
2016/09/12 19:46:42
flex: none. Done.
|
+ } |
+ |
#deviceEnabledButton { |
-webkit-margin-start: 10px; |
} |
@@ -37,16 +43,30 @@ |
} |
</style> |
<div class="settings-box two-line"> |
- <div id="details" actionable class="start layout horizontal center" |
- on-tap="onDetailsTap_"> |
- <cr-network-list-item class="flex" item="[[activeNetworkState]]"> |
+ <div id="details" selectable class="start layout horizontal center" |
michaelpg
2016/09/06 21:10:38
This is confusing because some of these classes ar
stevenjb
2016/09/12 19:46:42
Yeah, the layout classes can be tricky to decode,
|
+ noflex$="[[showSimInfo_(deviceState)]]" |
+ on-tap="onDetailsTap_" tabindex$="[[getTabIndex_(deviceState)]]"> |
+ <cr-network-list-item item="[[activeNetworkState]]"> |
</cr-network-list-item> |
<paper-spinner active="[[showScanning_(deviceState, expanded_)]]"> |
</paper-spinner> |
</div> |
+ |
+ <template is="dom-if" if="[[showSimInfo_(deviceState)]]"> |
+ <network-siminfo editable class="flex" |
+ network-properties="[[getCellularState_(deviceState)]]" |
+ networking-private="[[networkingPrivate]]"> |
+ </network-siminfo> |
+ </template> |
+ |
<div> |
<div id="buttons" class="layout horizontal"> |
<template is="dom-if" |
+ if="[[showDetailsIsVisible_(deviceState, networkStateList)]]"> |
+ <paper-icon-button icon="cr:settings" on-tap="onShowDetailsTap_"> |
michaelpg
2016/09/06 21:10:38
import cr_elements/icons.html
stevenjb
2016/09/12 19:46:42
Done.
|
+ </paper-icon-button> |
+ </template> |
+ <template is="dom-if" |
if="[[expandIsVisible_(deviceState, networkStateList)]]"> |
<cr-expand-button id="expandListButton" expanded="{{expanded_}}"> |
</cr-expand-button> |