MD Settings: Bluetooth: Use CrScrollableBehavior

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 e5bb255293897362e8117e9c26139941e9b7ea64..8bd9dc83950e621b0032afcc0000a234c7a4b662 100644
--- a/chrome/browser/resources/settings/bluetooth_page/bluetooth_page.html
+++ b/chrome/browser/resources/settings/bluetooth_page/bluetooth_page.html
@@ -6,6 +6,7 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable.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-toggle-button/paper-toggle-button.html">
+<link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.html">

[dschuyler, 2016/08/23 02:33:11]

sort in the import list?

[stevenjb, 2016/08/23 15:31:43]

Done.

 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_indicator.html">
 <link rel="import" href="/icons.html">
 <link rel="import" href="/settings_page/settings_animated_pages.html">
@@ -65,13 +66,19 @@
                                                     deviceListExpanded)]]">
           <div id="deviceList" class="list-frame vertical-list"
               on-device-event="onDeviceEvent_">
-            <template is="dom-repeat" items="[[deviceList]]"
-                filter="deviceIsPairedOrConnecting_">
-              <bluetooth-device-list-item device="[[item]]" class="list-item">
-              </bluetooth-device-list-item>
-            </template>
+            <div id="container" class="layout vertical" scrollable>
+              <iron-list items="[[getPairedOrConnecting_(deviceList.*)]]"
+                  selection-enabled selected-item="{{selectedItem}}"
+                  scroll-target="container">
+                <template>
+                  <bluetooth-device-list-item device="[[item]]"
+                      tabindex$="[[tabIndex]]">
+                  </bluetooth-device-list-item>
+                </template>
+              </iron-list>
+            </div>
             <div class="no-devices layout horizontal center"
-                hidden$="[[haveDevices_(deviceList.splices)]]">
+                hidden$="[[haveDevices_(deviceList.*)]]">
               $i18n{bluetoothNoDevices}
             </div>
           </div>
@@ -84,17 +91,19 @@
       </neon-animatable>
     </settings-animated-pages>
 
-    <bluetooth-device-dialog id="deviceDialog"
-        adapter-state="[[adapterState]]"
-        device-list="[[deviceList]]"
-        dialog-id="[[dialogId]]"
-        on-close="onDialogClosed_"
-        error-message="[[errorMessage]]"
-        on-device-event="onDeviceEvent_"
-        on-response="onResponse_"
-        pairing-device="[[pairingDevice]]"
-        pairing-event="[[pairingEvent]]">
-    </bluetooth-device-dialog>
+    <template is="dom-if" if="[[deviceListExpanded]]">
+      <bluetooth-device-dialog id="deviceDialog"
+          adapter-state="[[adapterState]]"
+          device-list="[[deviceList]]"
+          dialog-id="[[dialogId]]"
+          on-close="onDialogClosed_"
+          error-message="[[errorMessage]]"
+          on-device-event="onDeviceEvent_"
+          on-response="onResponse_"
+          pairing-device="[[pairingDevice]]"
+          pairing-event="[[pairingEvent]]">
+      </bluetooth-device-dialog>
+    </template>
 
   </template>
   <script src="bluetooth_page.js"></script>