MD Settings: Move bluetooth UI from dialog to subpage

chrome/browser/resources/settings/bluetooth_page/bluetooth_page.html

Index: chrome/browser/resources/settings/bluetooth_page/bluetooth_page.html
diff --git a/chrome/browser/resources/settings/bluetooth_page/bluetooth_page.html b/chrome/browser/resources/settings/bluetooth_page/bluetooth_page.html
index 4e67e5e18375525cb035d12552d74f55a7cd843c..cdcd55ad57535b16aec8ba6d2ec9f46251781d9e 100644
--- a/chrome/browser/resources/settings/bluetooth_page/bluetooth_page.html
+++ b/chrome/browser/resources/settings/bluetooth_page/bluetooth_page.html
@@ -4,6 +4,7 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classes/iron-flex-layout.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button-light.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/paper-toggle-button.html">
 <link rel="import" href="../i18n_setup.html">
 <link rel="import" href="../icons.html">
 <link rel="import" href="../prefs/prefs.html">
@@ -18,29 +19,36 @@
     </style>
     <settings-animated-pages id="pages" section="bluetooth">
       <neon-animatable route-path="default">
-        <div class="settings-box first" actionable on-tap="onTap_">
+        <div class="settings-box two-line" actionable on-tap="onTap_">
           <iron-icon icon="[[getIcon_(bluetoothEnabled_)]]"></iron-icon>
-          <span class="middle">[[getTitle_(bluetoothEnabled_)]]</span>
+          <div class="middle">
+            <div>$i18n{bluetoothPageTitle}</div>
+            <div class="secondary">[[getDescription_(bluetoothEnabled_)]]</div>
+          </div>
           <cr-policy-pref-indicator
               pref="[[prefs.cros.device.allow_bluetooth]]"
-              hidden="[[prefs.cros.device.allow_bluetooth.value]]">
+            hidden="[[prefs.cros.device.allow_bluetooth.value]]">
           </cr-policy-pref-indicator>
           <button class="subpage-arrow" is="paper-icon-button-light"
               on-tap="onSubpageArrowTap_">
           </button>
+          <div class="secondary-action">
+            <paper-toggle-button id="enableBluetooth"
+                checked="{{bluetoothEnabled_}}"
+                disabled="[[!adapterState_.available]]" on-tap="stopTap_">
+            </paper-toggle-button>
+          </div>
         </div>
       </neon-animatable>
 
       <template is="dom-if" route-path="/bluetoothDevices">
         <settings-subpage associated-control="[[$$('#bluetoothDevices')]]"
-            page-title="$i18n{bluetoothPageTitle}"
-            show-spinner="[[showSpinner_]]">
+            page-title="$i18n{bluetoothPageTitle}">
           <settings-bluetooth-subpage 
               adapter-state="[[adapterState_]]"
               bluetooth-enabled="{{bluetoothEnabled_}}"
               bluetooth="[[bluetooth]]"
-              bluetooth-private="[[bluetoothPrivate]]"
-              show-spinner="{{showSpinner_}}">
+              bluetooth-private="[[bluetoothPrivate]]">
           </settings-bluetooth-subpage>
         </settings-subpage>
       </template>