Merge lp:~ken-vandine/unity8/mouse_touchpad_schema into lp:unity8

[Ken VanDine]

Added keys needed for mouse and touchpad settings

Added keys needed for mouse and touchpad settings

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1906
http://jenkins.qa.ubuntu.com/job/unity8-ci/7017/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5934/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/432/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1722
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/425
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1617
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1617
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/424
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/423
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4582/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5945
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5945/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26427
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/186/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/430
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/430/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26426

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7017/rebuild

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

Is there a reason why we're not reusing the existing ones from unity7?

review: Needs Information

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:1906
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/19/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/19/rebuild

review: Approve (continuous-integration)

[Michael Terry (mterry)]

This also seems like not a great place for these settings. Are they really unity8 specific? They seem system-wide. Why'd you take these out of your other branch, out of the system-settings schema?

[Ken VanDine (ken-vandine)]

> This also seems like not a great place for these settings. Are they really
> unity8 specific? They seem system-wide. Why'd you take these out of your
> other branch, out of the system-settings schema?

I only had them in system-settings to help test the UI, they really don't belong in system-settings either. Settings will only be changing them, not using them. I'd be fine with moving them to a more generic package where the shell can use them.

Most of the settings for this that were in the design didn't really match up with unity7/gnome settings (not sure why). I'd be happy to rework that if you have suggestions.

[Michael Terry (mterry)]

The "package-neutral" location we have for gsettings and AccountsService schemas is lp:gsettings-ubuntu-touch-schemas. I can propose a branch there.

[Michael Terry (mterry)]

Let's move to https://code.launchpad.net/~mterry/gsettings-ubuntu-touch-schemas/input-schema/+merge/283546

Unmerged revisions

1906. By Ken VanDine on 2016-01-05

merged trunk

1905. By Ken VanDine on 2015-10-19

merged trunk

1904. By Ken VanDine on 2015-08-11

Fixed types

1903. By Ken VanDine on 2015-08-06

Fixed primary-button-enum in schema

1902. By Ken VanDine on 2015-08-06

Added keys needed for mouse and touchpad settings

1901. By Launchpad Translations on behalf of unity-team on 2015-08-05

Launchpad automatic translations update.

=== modified file 'data/com.canonical.Unity8.gschema.xml'
--- data/com.canonical.Unity8.gschema.xml	2015-11-24 17:44:18 +0000
+++ data/com.canonical.Unity8.gschema.xml	2016-01-05 14:56:28 +0000
@@ -5,12 +5,91 @@
     <value nick="Automatic" value="2" />
   </enum>
 
+  <enum id="primary-button-enum">
+    <value nick="Left" value="0" />
+    <value nick="Middle" value="1" />
+    <value nick="Right" value="2" />
+  </enum>
+
   <schema path="/com/canonical/unity8/" id="com.canonical.Unity8" gettext-domain="unity8">
     <key enum="usage-mode-enum" name="usage-mode">
       <default>"Automatic"</default>
       <summary>The usage mode.</summary>
       <description>The usage mode chosen will affect the Window Management behaviour.</description>
     </key>
+
+    <key enum="primary-button-enum" name="mouse-primary-button">
+      <default>"Left"</default>
+      <summary>Primary Mouse Button.</summary>
+      <description>The primary mouse button.</description>
+    </key>
+
+    <key name="mouse-cursor-speed" type="d">
+      <default>0.5</default>
+      <summary>Mouse cursor speed.</summary>
+      <description>Mouse cursor speed.</description>
+    </key>
+
+    <key name="mouse-double-click-speed" type="i">
+      <default>100</default>
+      <summary>Mouse double click speed.</summary>
+      <description>Mouse double click speed in milliseconds.</description>
+    </key>
+
+    <key name="mouse-scroll-speed" type="d">
+      <default>0.5</default>
+      <summary>Mouse scroll speed.</summary>
+      <description>Mouse scroll speed.</description>
+    </key>
+
+    <key enum="primary-button-enum" name="touchpad-primary-button">
+      <default>"Left"</default>
+      <summary>Primary Touchpad Button.</summary>
+      <description>The primary touchpad button.</description>
+    </key>
+
+    <key name="touchpad-cursor-speed" type="d">
+      <default>0.5</default>
+      <summary>Touchpad cursor speed.</summary>
+      <description>Touchpad cursor speed.</description>
+    </key>
+
+    <key name="touchpad-double-click-speed" type="i">
+      <default>100</default>
+      <summary>Touchpad double click speed.</summary>
+      <description>Touchpad double click speed in milliseconds.</description>
+    </key>
+
+    <key name="touchpad-scroll-speed" type="d">
+      <default>0.5</default>
+      <summary>Touchpad scroll speed.</summary>
+      <description>Touchpad scroll speed.</description>
+    </key>
+
+    <key name="touchpad-disable-while-typing" type="b">
+      <default>false</default>
+      <summary>Ignore Touchpad while typing.</summary>
+      <description>Disable touchpad while typing.</description>
+    </key>
+
+    <key name="touchpad-tap-to-click" type="b">
+      <default>false</default>
+      <summary>Tap to click.</summary>
+      <description>Touchpad tap to click.</description>
+    </key>
+
+    <key name="touchpad-two-finger-scroll" type="b">
+      <default>false</default>
+      <summary>Two finger scrolling.</summary>
+      <description>Touchpad two finger scrolling.</description>
+    </key>
+
+    <key name="touchpad-disable-with-mouse" type="b">
+      <default>true</default>
+      <summary>Ignore touchpad when a mouse is connected.</summary>
+      <description>Disable touchpad when a mouse is connected.</description>
+    </key>
+
     <key type="y" name="edge-barrier-sensitivity">
       <default>35</default>
       <range min="1" max="100"/>