# HG changeset patch
# Parent b507815dabb53f252e130638f04fb0d95192932f

diff --git a/mobile/android/chrome/content/bindings.xml b/mobile/android/chrome/content/bindings.xml
--- a/mobile/android/chrome/content/bindings.xml
+++ b/mobile/android/chrome/content/bindings.xml
@@ -104,43 +104,16 @@
           // Just forward the menuitem command events, which the toolkit version does.
           if (event.target.parentNode.parentNode != this)
             event.stopPropagation();
         ]]>
       </handler>
     </handlers>
   </binding>
 
-  <binding id="chrome-select-option">
-    <content orient="horizontal" flex="1">
-      <xul:image class="chrome-select-option-image" anonid="check"/>
-      <xul:label anonid="label" xbl:inherits="value=label"/>
-    </content>
-
-    <implementation>
-      <property name="selected">
-        <getter>
-          <![CDATA[
-            return this.hasAttribute("selected");
-          ]]>
-        </getter>
-        <setter>
-          <![CDATA[
-            if (val)
-              this.setAttribute("selected", "true");
-            else
-              this.removeAttribute("selected");
-            return val;
-          ]]>
-        </setter>
-      </property>
-    </implementation>
-  </binding>
-
-
   <binding id="textbox" extends="chrome://global/content/bindings/textbox.xml#textbox">
     <handlers>
       <handler event="TapLong" phase="capturing">
         <![CDATA[
           let box = this.inputField.parentNode;
           box.showContextMenu(this, false);
         ]]>
       </handler>
@@ -256,75 +229,9 @@
             }
           }
 
           ContextHelper.showPopup({ target: aTextbox, json: json });
         ]]></body>
       </method>
     </implementation>
   </binding>
-  
-  <binding id="setting-fulltoggle-bool" extends="chrome://mozapps/content/extensions/setting.xml#setting-bool">
-    <handlers>
-      <handler event="click" button="0" phase="capturing">
-        <![CDATA[
-        event.stopPropagation();
-        ]]>
-      </handler>
-      <handler event="command" button="0" phase="capturing">
-        <![CDATA[
-        event.stopPropagation();
-        ]]>
-      </handler>
-      <handler event="TapSingle" button="0" phase="capturing">
-        <![CDATA[
-        this.input.setChecked(!this.value);
-        this.inputChanged();
-        this.fireEvent("oncommand");
-        ]]>
-      </handler>
-    </handlers>
-  </binding>
-
-  <binding id="setting-fulltoggle-boolint" extends="chrome://mozapps/content/extensions/setting.xml#setting-boolint">
-    <handlers>
-      <handler event="click" button="0" phase="capturing">
-        <![CDATA[
-        event.stopPropagation();
-        ]]>
-      </handler>
-      <handler event="command" button="0" phase="capturing">
-        <![CDATA[
-        event.stopPropagation();
-        ]]>
-      </handler>
-      <handler event="TapSingle" button="0" phase="capturing">
-        <![CDATA[
-        this.input.setChecked(!this.value);
-        this.inputChanged();
-        this.fireEvent("oncommand");
-        ]]>
-      </handler>
-    </handlers>
-  </binding>
-
-  <binding id="setting-fulltoggle-localized-bool" extends="chrome://mozapps/content/extensions/setting.xml#setting-localized-bool">
-    <handlers>
-      <handler event="click" button="0" phase="capturing">
-        <![CDATA[
-        event.stopPropagation();
-        ]]>
-      </handler>
-      <handler event="command" button="0" phase="capturing">
-        <![CDATA[
-        event.stopPropagation();
-        ]]>
-      </handler>
-      <handler event="TapSingle" button="0" phase="capturing">
-        <![CDATA[
-        this.input.setChecked(!this.value);
-        this.inputChanged();
-        this.fireEvent("oncommand");
-        ]]>
-      </handler>
-    </handlers>
-  </binding>
 </bindings>
diff --git a/mobile/android/chrome/content/bindings/settings.xml b/mobile/android/chrome/content/bindings/settings.xml
new file mode 100644
--- /dev/null
+++ b/mobile/android/chrome/content/bindings/settings.xml
@@ -0,0 +1,326 @@
+<?xml version="1.0"?>
+
+<bindings
+    xmlns="http://www.mozilla.org/xbl"
+    xmlns:xbl="http://www.mozilla.org/xbl"
+    xmlns:html="http://www.w3.org/1999/xhtml"
+    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <binding id="settings">
+    <content>
+      <html:div class="settings-title" xbl:inherits="xbl:text=label"/>
+      <children />
+    </content>
+  </binding>
+
+  <binding id="setting-bool" extends="chrome://mozapps/content/extensions/setting.xml#setting-base">
+    <content>
+      <html:div class="setting-label">
+        <html:div class="preferences-title" xbl:inherits="xbl:text=title"/>
+        <html:div class="preferences-description" xbl:inherits="xbl:text=desc">
+          <children/>
+        </html:div>
+      </html:div>
+      <html:div anonid="input-container" class="setting-input">
+        <html:input type="checkbox" anonid="input" xbl:inherits="disabled,onlabel,offlabel" oncommand="inputChanged();"/>
+      </html:div>
+    </content>
+
+    <implementation>
+      <method name="valueFromPreference">
+        <body>
+        <![CDATA[
+          let val = Services.prefs.getBoolPref(this.pref);
+          this.value = this.inverted ? !val : val;
+         ]]>
+        </body>
+      </method>
+
+      <method name="valueToPreference">
+        <body>
+        <![CDATA[
+          let val = this.value;
+          Services.prefs.setBoolPref(this.pref, this.inverted ? !val : val);
+        ]]>
+        </body>
+      </method>
+
+      <property name="value" onget="return this.input.checked;" onset="return this.input.setChecked(val);"/>
+      <property name="inverted" readonly="true" onget="return this.getAttribute('inverted');"/>
+    </implementation>
+  </binding>
+
+  <binding id="setting-boolint" extends="chrome://mozapps/content/extensions/setting.xml#setting-base">
+    <content>
+      <html:div class="setting-label">
+        <html:div class="preferences-title" xbl:inherits="xbl:text=title"/>
+        <html:div class="preferences-description" xbl:inherits="xbl:text=desc">
+          <children/>
+        </html:div>
+      </html:div>
+      <html:div anonid="input-container" class="setting-input">
+        <html:input type="checkbox" anonid="input" xbl:inherits="disabled,onlabel,offlabel" oncommand="inputChanged();"/>
+      </html:div>
+    </content>
+
+    <implementation>
+      <method name="valueFromPreference">
+        <body>
+        <![CDATA[
+          let val = Services.prefs.getIntPref(this.pref);
+          this.value = (val == this.getAttribute("on"));
+         ]]>
+        </body>
+      </method>
+
+      <method name="valueToPreference">
+        <body>
+        <![CDATA[
+          Services.prefs.setIntPref(this.pref, this.getAttribute(this.value ? "on" : "off"));
+        ]]>
+        </body>
+      </method>
+
+      <property name="value" onget="return this.input.checked;" onset="return this.input.setChecked(val);"/>
+      <property name="inverted" readonly="true" onget="return this.getAttribute('inverted');"/>
+    </implementation>
+  </binding>
+
+  <binding id="setting-localized-bool" extends="chrome://browser/content/bindings/settings.xml#setting-bool">
+    <implementation>
+      <method name="valueFromPreference">
+        <body>
+        <![CDATA[
+          let val = Services.prefs.getComplexValue(this.pref, Components.interfaces.nsIPrefLocalizedString).data;
+          if(this.inverted) val = !val;
+          this.value = (val == "true");
+         ]]>
+        </body>
+      </method>
+
+      <method name="valueToPreference">
+        <body>
+        <![CDATA[
+          let val = this.value;
+          if(this.inverted) val = !val;
+          let pref = Components.classes["@mozilla.org/pref-localizedstring;1"].createInstance(Components.interfaces.nsIPrefLocalizedString);
+          pref.data = this.inverted ? (!val).toString() : val.toString();
+          Services.prefs.setComplexValue(this.pref, Components.interfaces.nsIPrefLocalizedString, pref);
+        ]]>
+        </body>
+      </method>
+
+    </implementation>
+  </binding>
+
+  <binding id="setting-integer" extends="chrome://mozapps/content/extensions/setting.xml#setting-base">
+    <content>
+      <html:div class="setting-label">
+        <html:div class="preferences-title" xbl:inherits="xbl:text=title"/>
+        <html:div class="preferences-description" xbl:inherits="xbl:text=desc">
+          <children/>
+        </html:div>
+      </html:div>
+      <html:div anonid="input-container" class="setting-input">
+        <html:input type="number" anonid="input" xbl:inherits="disabled,placeholder,min,max,step" oninput="inputChanged();" onchange="inputChanged();"/>
+      </html:div>
+    </content>
+
+    <implementation>
+      <method name="valueFromPreference">
+        <body>
+        <![CDATA[
+          let val = Services.prefs.getIntPref(this.pref);
+          this.value = val;
+         ]]>
+        </body>
+      </method>
+
+      <method name="valueToPreference">
+        <body>
+        <![CDATA[
+          Services.prefs.setIntPref(this.pref, this.value);
+        ]]>
+        </body>
+      </method>
+
+      <property name="type" readonly="true" onget="return this.getAttribute('type');"/>
+      <property name="value" onget="return this.input.value;" onset="return this.input.value = val;"/>
+    </implementation>
+  </binding>
+
+  <binding id="setting-control" extends="chrome://mozapps/content/extensions/setting.xml#setting-base">
+    <content>
+      <html:div class="setting-label">
+        <html:div class="preferences-title" xbl:inherits="xbl:text=title"/>
+        <html:div class="preferences-description" xbl:inherits="xbl:text=desc">
+          <children/>
+        </html:div>
+      </html:div>
+      <html:div anonid="input-container" class="setting-input">
+        <children includes="button|menulist"/>
+      </html:div>
+    </content>
+  </binding>
+
+  <binding id="setting-string" extends="chrome://mozapps/content/extensions/setting.xml#setting-base">
+    <content>
+      <html:div class="setting-label">
+        <html:div class="preferences-title" xbl:inherits="xbl:text=title"/>
+        <html:div class="preferences-description" xbl:inherits="xbl:text=desc">
+          <children/>
+        </html:div>
+      </html:div>
+      <html:div anonid="input-container" class="setting-input">
+        <html:input xbl:inherits="disabled,placeholder,type=inputtype,min,max,maxlength,step,list,pattern" anonid="input" oninput="inputChanged();"/>
+      </html:div>
+    </content>
+
+    <implementation>
+      <method name="valueFromPreference">
+        <body>
+        <![CDATA[
+          const nsISupportsString = Components.interfaces.nsISupportsString;
+          this.value = Services.prefs.getComplexValue(this.pref, nsISupportsString).data;
+         ]]>
+        </body>
+      </method>
+
+      <method name="valueToPreference">
+        <body>
+        <![CDATA[
+          const nsISupportsString = Components.interfaces.nsISupportsString;
+          let iss = Components.classes["@mozilla.org/supports-string;1"].createInstance(nsISupportsString);
+          iss.data = this.value;
+          Services.prefs.setComplexValue(this.pref, nsISupportsString, iss);
+        ]]>
+        </body>
+      </method>
+
+      <property name="value" onget="return this.input.value;" onset="return this.input.value=val;"/>
+    </implementation>
+  </binding>
+
+  <binding id="setting-multi" extends="chrome://mozapps/content/extensions/setting.xml#setting-base">
+    <content>
+      <html:div class="setting-label">
+        <html:div class="preferences-title" xbl:inherits="xbl:text=title"/>
+        <html:div class="preferences-description" xbl:inherits="xbl:text=desc">
+          <children/>
+        </html:div>
+      </html:div>
+      <html:div anonid="input-container" class="setting-input">
+        <html:select size="1">
+          <children includes="option" />
+        </html:select>
+      </html:div>
+    </content>
+
+    <implementation>
+      <constructor>
+      <![CDATA[
+        this.control.addEventListener("command", this.valueToPreference.bind(this), false);
+      ]]>
+      </constructor>
+
+      <method name="valueFromPreference">
+        <body>
+        <![CDATA[
+          let val;
+          switch (Services.prefs.getPrefType(this.pref)) {
+            case Ci.nsIPrefBranch.PREF_STRING:
+              val = Services.prefs.getCharPref(this.pref);
+              break;
+            case Ci.nsIPrefBranch.PREF_INT:
+              val = Services.prefs.getIntPref(this.pref);
+              break;
+            case Ci.nsIPrefBranch.PREF_BOOL:
+              val = Services.prefs.getBoolPref(this.pref).toString();
+              break;
+            default:
+              return;
+          }
+
+          for (let i = 0; i < this.control.itemCount; i++) {
+            if (this.control.getItemAtIndex(i).value == val) {
+              this.control.selectedIndex = i;
+              break;
+            }
+          }
+        ]]>
+        </body>
+      </method>
+
+      <method name="valueToPreference">
+        <body>
+        <![CDATA[
+          // We might not have a pref already set, so we guess the type from the value attribute
+          let val = this.control.selectedItem.value;
+          if (val == "true" || val == "false")
+            Services.prefs.setBoolPref(this.pref, val == "true");
+          else if (/^-?\d+$/.test(val))
+            Services.prefs.setIntPref(this.pref, val);
+          else
+            Services.prefs.setCharPref(this.pref, val);
+        ]]>
+        </body>
+      </method>
+
+      <field name="control">this.getElementsByTagName(this.getAttribute("type") == "radio" ? "radiogroup" : "menulist")[0];</field>
+    </implementation>
+  </binding>
+
+  <binding id="setting-fulltoggle-bool" extends="chrome://browser/content/bindings/settings.xml#setting-bool">
+    <handlers>
+      <handler event="command" button="0" phase="capturing">
+        <![CDATA[
+        event.stopPropagation();
+        ]]>
+      </handler>
+      <handler event="click" button="0" phase="capturing">
+        <![CDATA[
+        event.stopPropagation();
+        this.input.checked = !this.input.checked;
+        this.inputChanged();
+        this.fireEvent("oncommand");
+        ]]>
+      </handler>
+    </handlers>
+  </binding>
+
+  <binding id="setting-fulltoggle-boolint" extends="chrome://browser/content/bindings/settings.xml#setting-boolint">
+    <handlers>
+      <handler event="command" button="0" phase="capturing">
+        <![CDATA[
+        event.stopPropagation();
+        ]]>
+      </handler>
+      <handler event="click" button="0" phase="capturing">
+        <![CDATA[
+        event.stopPropagation();
+        this.input.checked = !this.input.checked;
+        this.inputChanged();
+        this.fireEvent("oncommand");
+        ]]>
+      </handler>
+    </handlers>
+  </binding>
+
+  <binding id="setting-fulltoggle-localized-bool" extends="chrome://browser/content/bindings/settings.xml#setting-localized-bool">
+    <handlers>
+      <handler event="command" button="0" phase="capturing">
+        <![CDATA[
+        event.stopPropagation();
+        ]]>
+      </handler>
+      <handler event="click" button="0" phase="capturing">
+        <![CDATA[
+        event.stopPropagation();
+        this.input.checked = !this.input.checked;
+        this.inputChanged();
+        this.fireEvent("oncommand");
+        ]]>
+      </handler>
+    </handlers>
+  </binding>
+</bindings>
diff --git a/mobile/android/chrome/content/browser.css b/mobile/android/chrome/content/browser.css
--- a/mobile/android/chrome/content/browser.css
+++ b/mobile/android/chrome/content/browser.css
@@ -1,50 +1,8 @@
-settings {
-  -moz-binding: url("chrome://mozapps/content/extensions/setting.xml#settings");
-}
-
-setting[type="bool"] {
-  -moz-binding: url("chrome://browser/content/bindings.xml#setting-fulltoggle-bool");
-}
-
-setting[type="bool"][localized="true"] {
-  -moz-binding: url("chrome://browser/content/bindings.xml#setting-fulltoggle-localized-bool");
-}
-
-setting[type="boolint"] {
-  -moz-binding: url("chrome://browser/content/bindings.xml#setting-fulltoggle-boolint");
-}
-
-setting[type="integer"] {
-  -moz-binding: url("chrome://mozapps/content/extensions/setting.xml#setting-integer");
-}
-
-setting[type="control"] {
-  -moz-binding: url("chrome://mozapps/content/extensions/setting.xml#setting-control");
-}
-
-setting[type="string"] {
-  -moz-binding: url("chrome://mozapps/content/extensions/setting.xml#setting-string");
-}
-
-setting[type="color"] {
-  -moz-binding: url("chrome://mozapps/content/extensions/setting.xml#setting-color");
-}
-
-setting[type="file"],
-setting[type="directory"] {
-  -moz-binding: url("chrome://mozapps/content/extensions/setting.xml#setting-path");
-}
-
-setting[type="radio"],
-setting[type="menulist"] {
-  -moz-binding: url("chrome://mozapps/content/extensions/setting.xml#setting-multi");
-}
-
 radio {
   -moz-binding: url("chrome://global/content/bindings/radio.xml#radio");
 }
 
 checkbox {
   -moz-binding: url("chrome://browser/content/bindings/checkbox.xml#checkbox-radio");
 }
 
diff --git a/mobile/android/chrome/jar.mn b/mobile/android/chrome/jar.mn
--- a/mobile/android/chrome/jar.mn
+++ b/mobile/android/chrome/jar.mn
@@ -10,16 +10,17 @@ chrome.jar:
   content/aboutHome.xhtml              (content/aboutHome.xhtml)
 * content/aboutRights.xhtml            (content/aboutRights.xhtml)
   content/blockedSite.xhtml            (content/blockedSite.xhtml)
   content/languages.properties         (content/languages.properties)
 * content/browser.xul                  (content/browser.xul)
 * content/browser.js                   (content/browser.js)
 * content/bindings.xml                 (content/bindings.xml)
   content/bindings/checkbox.xml        (content/bindings/checkbox.xml)
+  content/bindings/settings.xml        (content/bindings/settings.xml)
   content/bindings/dialog.xml          (content/bindings/dialog.xml)
   content/browser.css                  (content/browser.css)
   content/cursor.css                   (content/cursor.css)
 % content branding %content/branding/
   content/sanitize.js                  (content/sanitize.js)
   content/exceptions.js                (content/exceptions.js)
 * content/downloads.js                 (content/downloads.js)
   content/netError.xhtml               (content/netError.xhtml)
diff --git a/mobile/android/themes/core/aboutAddons.css b/mobile/android/themes/core/aboutAddons.css
--- a/mobile/android/themes/core/aboutAddons.css
+++ b/mobile/android/themes/core/aboutAddons.css
@@ -171,8 +171,105 @@ body[dir="ltr"] .favicon {
   width: 32px;
   height: 32px;
   position: absolute;
 }
 
 .addon-item[isDisabled="true"] .favicon {
   opacity: 0.3;
 }
+
+.options-header {
+  font-weight: bold;
+  margin: 16px;
+  border-bottom: 2px solid;
+  -moz-border-bottom-colors: #ffffff #bac2ac;
+}
+
+setting {
+  padding: 2px;
+  -moz-padding-start: 12px;
+  border-bottom: 2px solid;
+  -moz-border-bottom-colors: #ffffff #bac2ac;
+  min-height: 86px;
+  display: -moz-box;
+  width: 100%;
+  -moz-box-sizing: border-box;
+  -moz-box-flex: 1;
+  -moz-box-align: start;
+  -moz-box-orient: horizontal;
+}
+
+.setting-label {
+  display: -moz-box;
+  -moz-box-orient: vertical;
+  -moz-box-flex: 1;
+}
+
+.preferences-title {
+  font-weight: bold;
+}
+
+.setting-label > div:empty {
+  display: none;
+}
+
+/* Put setting textboxes on a separate row */
+setting[type="integer"],
+setting[type="string"] {
+  -moz-box-align: start;
+  -moz-box-orient: vertical;
+}
+
+setting[type="integer"] > .setting-label,
+setting[type="string"] > .setting-label {
+  -moz-box-flex: 0;
+}
+
+setting[type="integer"] > .setting-input > input,
+setting[type="string"] > .setting-input > input {
+  width: 400px;
+}
+
+.setting-input > input {
+  font-size: 22px !important;
+}
+
+.setting-input > input[type="checkbox"] {
+  -moz-appearance: none !important;
+  width: 22px !important;
+  height: 22px !important;
+}
+
+/* XBL bindings */
+
+settings {
+  -moz-binding: url("chrome://browser/content/bindings/settings.xml#settings");
+}
+
+setting[type="bool"] {
+  -moz-binding: url("chrome://browser/content/bindings/settings.xml#setting-fulltoggle-bool");
+}
+
+setting[type="bool"][localized="true"] {
+  -moz-binding: url("chrome://browser/content/bindings/settings.xml#setting-fulltoggle-localized-bool");
+}
+
+setting[type="boolint"] {
+  -moz-binding: url("chrome://browser/content/bindings/settings.xml#setting-fulltoggle-boolint");
+}
+
+setting[type="integer"] {
+  -moz-binding: url("chrome://browser/content/bindings/settings.xml#setting-integer");
+}
+
+setting[type="control"] {
+  -moz-binding: url("chrome://browser/content/bindings/settings.xml#setting-control");
+}
+
+setting[type="string"] {
+  -moz-binding: url("chrome://browser/content/bindings/settings.xml#setting-string");
+}
+
+setting[type="radio"],
+setting[type="menulist"] {
+  -moz-binding: url("chrome://browser/content/bindings/settings.xml#setting-multi");
+}