[MD settings] advanced toggle; add scrollWhenReady

chrome/browser/resources/settings/settings_main/settings_main.html

Index: chrome/browser/resources/settings/settings_main/settings_main.html
diff --git a/chrome/browser/resources/settings/settings_main/settings_main.html b/chrome/browser/resources/settings/settings_main/settings_main.html
index 26474cea0cb5c94a8d29f2a33038888d7c8adec6..8c52ded14fbddfa372307d16aa247e6d4c6ee8f9 100644
--- a/chrome/browser/resources/settings/settings_main/settings_main.html
+++ b/chrome/browser/resources/settings/settings_main/settings_main.html
@@ -1,4 +1,6 @@
+<link rel="import" href="chrome://resources/cr_elements/icons.html">
 <link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
 <link rel="import" href="/about_page/about_page.html">
 <link rel="import" href="/advanced_page/advanced_page.html">
 <link rel="import" href="/basic_page/basic_page.html">
@@ -6,51 +8,55 @@
 
 <dom-module id="settings-main">
   <template>
-      <style>
-        #advancedToggle {
-          align-items: center;
-          display: flex;
-          min-height: 32px;
-          padding: 0 12px;  /* TODO(dschuyler): get real value. */
-        }
+    <style>
+      #advancedToggle {
+        align-items: center;
+        display: flex;
+        margin-bottom: 24px;
+        margin-top: 12px;  /* Part of a 48px spacer (33px + 12px + 3px). */
+        min-height: 32px;
+        padding: 0 12px;
+      }
 
-        #pageContainer {
-          box-sizing: border-box;
-          overflow: auto;
-          padding: 0 16px;
-        }
+      #toggleContainer {
+        align-items: center;
+        display: flex;
+        justify-content: center;
+        margin-bottom: -var(--settings-page-vertical-margin);
+      }
 
-        #toggleContainer {
-          align-items: center;
-          display: flex;
-          justify-content: center;
-          min-height: 80px;  /* TODO(dschuyler): get real value. */
-        }
-      </style>
+      #toggleSpacer {
+        padding-top: 33px;  /* Part of a 48px spacer (33px + 12px + 3px). */
+      }
+
+      iron-icon {
+        -webkit-margin-start: 16px;
+      }
+    </style>
     <content select="paper-icon-button"></content>
-    <div id="pageContainer">
-      <template is="dom-if" if="[[showBasicPage_]]">
-        <settings-basic-page prefs="{{prefs}}" current-route="{{currentRoute}}">
-        </settings-basic-page>
-      </template>
-      <template is="dom-if" if="[[showAdvancedToggle_]]">
-        <div id="toggleContainer">
-          <div id="advancedToggle" on-tap="toggleAdvancedPage_">
-            $i18n{advancedPageTitle}
-            <!-- TODO(dschuyler): menu icons (up arrow/down arrow) -->
-          </div>
+    <template is="dom-if" if="[[showBasicPage_]]">
+      <settings-basic-page prefs="{{prefs}}" current-route="{{currentRoute}}">
+      </settings-basic-page>
+    </template>
+    <template is="dom-if" if="[[showAdvancedToggle_]]">
+      <div id="toggleSpacer">

[michaelpg, 2016/06/16 03:45:59]

nit: </div> on same line

[dschuyler, 2016/06/16 20:14:21]

Done.

+      </div>
+      <div id="toggleContainer">
+        <div id="advancedToggle" on-tap="toggleAdvancedPage_">
+          <span>$i18n{advancedPageTitle}</span>
+          <iron-icon icon="[[arrowState_(showAdvancedPage_)]]"></iron-icon>
         </div>
-      </template>
-      <template is="dom-if" if="[[showAdvancedPage_]]">
-        <settings-advanced-page prefs="{{prefs}}"
-            current-route="{{currentRoute}}">
-        </settings-advanced-page>
-      </template>
-      <template is="dom-if" if="[[showAboutPage_]]">
-        <settings-about-page current-route="{{currentRoute}}">
-        </settings-about-page>
-      </template>
-    </div>
+      </div>
+    </template>
+    <template is="dom-if" if="[[showAdvancedPage_]]">
+      <settings-advanced-page prefs="{{prefs}}"
+          current-route="{{currentRoute}}">
+      </settings-advanced-page>
+    </template>
+    <template is="dom-if" if="[[showAboutPage_]]">
+      <settings-about-page current-route="{{currentRoute}}">
+      </settings-about-page>
+    </template>
   </template>
   <script src="settings_main.js"></script>
 </dom-module>