Merge lp:~albertomilone/unity-settings-daemon/1326636-14.10 into lp:unity-settings-daemon/14.04
Status: | Superseded |
---|---|
Proposed branch: | lp:~albertomilone/unity-settings-daemon/1326636-14.10 |
Merge into: | lp:unity-settings-daemon/14.04 |
Prerequisite: | lp:~albertomilone/unity-settings-daemon/lp1287341-14.10 |
Diff against target: |
32 lines (+4/-3) 2 files modified
debian/changelog (+2/-2) plugins/xrandr/gsd-xrandr-manager.c (+2/-1) |
To merge this branch: | bzr merge lp:~albertomilone/unity-settings-daemon/1326636-14.10 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Unity Settings Daemon Development Team | Pending | ||
Review via email: mp+222169@code.launchpad.net |
Unmerged revisions
- 4045. By Alberto Milone
-
Revert changes to the changelog
- 4044. By Alberto Milone
-
gsd-xrandr-
manager. c: do not try to map an invalid touch device on initialisation Fixes LP: #1326636
- 4043. By Alberto Milone
-
Start work on 14.04.0+
14.10.20140604- 0ubuntu2 - 4042. By PS Jenkins bot
-
Releasing 14.04.0+
14.10.20140604- 0ubuntu1 - 4041. By Alberto Milone
-
gsd-xrandr-
manager. c: add support for mapping the main touchscreen onto the main display This makes sure that the touch input device knows exactly the
area that represents the display when the screen configuration
changes.We give the highest priority to outputs that use an embedded
display connector such as LVDS or eDP. If no embedded connector
can be found, we try to match the size reported by the touch
input device with the size reported by the EDID of the display.Note: this doesn't cover the tablet use case.
This is a partial backport of the upstream code. I haven't
backported the new device mapper, as that's something that
would be best handled with a full sync with upstream (it's
too much code to backport).Fixes LP: #1287341