Unity 8

Merge lp://qastaging/~unity-team/unity8/silo0 into lp://qastaging/unity8

  1. silo0
  2. Merge into trunk
Proposed by Gerry Boland
Status: Work in progress
Proposed branch: lp://qastaging/~unity-team/unity8/silo0
Merge into: lp://qastaging/unity8
Diff against target: 3037 lines (+1195/-623)
45 files modified
CMakeLists.txt (+1/-1)
debian/changelog (+6/-0)
debian/control (+2/-1)
plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux.cpp (+2/-11)
qml/Components/InputMethod.qml (+26/-21)
qml/DeviceConfiguration.qml (+2/-0)
qml/Greeter/Greeter.qml (+1/-1)
qml/Launcher/Launcher.qml (+1/-0)
qml/OrientedShell.qml (+10/-1)
qml/Panel/Panel.qml (+1/-0)
qml/Rotation/RotationStates.qml (+4/-1)
qml/Shell.qml (+8/-21)
qml/Stages/ApplicationWindow.qml (+2/-1)
qml/Stages/DecoratedWindow.qml (+6/-3)
qml/Stages/DesktopStage.qml (+6/-11)
qml/Stages/ResizeArea.qml (+142/-0)
qml/Stages/SurfaceContainer.qml (+38/-21)
qml/Stages/WindowDecoration.qml (+31/-4)
qml/Stages/WindowResizeArea.qml (+96/-63)
tests/mocks/Unity/Application/ApplicationInfo.cpp (+11/-3)
tests/mocks/Unity/Application/ApplicationInfo.h (+4/-6)
tests/mocks/Unity/Application/ApplicationTestInterface.cpp (+3/-3)
tests/mocks/Unity/Application/ApplicationTestInterface.h (+3/-3)
tests/mocks/Unity/Application/CMakeLists.txt (+4/-1)
tests/mocks/Unity/Application/Cursor.qml (+20/-0)
tests/mocks/Unity/Application/MirSurface.cpp (+182/-0)
tests/mocks/Unity/Application/MirSurface.h (+111/-0)
tests/mocks/Unity/Application/MirSurfaceItem.cpp (+193/-100)
tests/mocks/Unity/Application/MirSurfaceItem.h (+41/-76)
tests/mocks/Unity/Application/MirSurfaceItem.qml (+2/-0)
tests/mocks/Unity/Application/MirSurfaceItemModel.h (+0/-35)
tests/mocks/Unity/Application/Session.cpp (+47/-37)
tests/mocks/Unity/Application/Session.h (+14/-7)
tests/mocks/Unity/Application/SurfaceManager.cpp (+14/-17)
tests/mocks/Unity/Application/SurfaceManager.h (+8/-11)
tests/mocks/Unity/Application/VirtualKeyboard.cpp (+7/-6)
tests/mocks/Unity/Application/VirtualKeyboard.h (+6/-9)
tests/mocks/Unity/Application/plugin.cpp (+11/-8)
tests/mocks/Unity/Application/qmldir (+1/-0)
tests/qmltests/CMakeLists.txt (+1/-1)
tests/qmltests/Stages/tst_ApplicationWindow.qml (+39/-29)
tests/qmltests/Stages/tst_SurfaceContainer.qml (+26/-32)
tests/qmltests/Stages/tst_WindowResizeArea.qml (+6/-34)
tests/qmltests/tst_OrientedShell.qml (+32/-20)
tests/qmltests/tst_Shell.qml (+24/-24)
To merge this branch: bzr merge lp://qastaging/~unity-team/unity8/silo0
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+264171@code.qastaging.launchpad.net

Commit message

DO NOT MERGE! Extras for pocket desktop demo in silo0.

To post a comment you must log in.
lp://qastaging/~unity-team/unity8/silo0 updated
1850. By Launchpad Translations on behalf of unity-team

Launchpad automatic translations update.

1851. By Launchpad Translations on behalf of unity-team

Launchpad automatic translations update.

1852. By Launchpad Translations on behalf of unity-team

Launchpad automatic translations update.

1853. By Daniel d'Andrada

Dismiss the apps spread if greeter gets shown

Enables Shell to rotate itself back into place while greeter is shown because PhoneStage doesn't allow rotations while the apps spread is open Fixes: #1471609
Approved by: Michael Zanetti

1854. By Albert Astals Cid

Revert Session Screenshotter Fixes: #1473476
Approved by: Michael Zanetti

1855. By CI Train Bot Account

Releasing 8.10+15.10.20150713-0ubuntu1

1856. By Launchpad Translations on behalf of unity-team

Launchpad automatic translations update.

1857. By Launchpad Translations on behalf of unity-team

Launchpad automatic translations update.

1858. By Launchpad Translations on behalf of unity-team

Launchpad automatic translations update.

1859. By Josh Arenson

Add a basic autopilot test for the SettingsWizard
Approved by: Albert Astals Cid, Richard Huddie

1860. By Daniel d'Andrada

Update tst_ShellWithPin

Spread is no longer enabled while the greeter is being shown.
Approved by: Albert Astals Cid

1861. By Albert Astals Cid

Fix build with ninja
Approved by: Pete Woods, Michael Zanetti

1862. By Nick Dedekind

Fixed qml warnings in 'make tryShell'
Approved by: Mirco Müller

1863. By Albert Astals Cid

Ensure tutorial doesn't let user drag the launcher past screen edge.

This was because the bouncing animation on the left added a bit of extra offset to the launcher. So I just made sure that offset doesn't go past the screen edge as the user drags the launcher out.

And added a test. Fixes: #1454882
Approved by: Albert Astals Cid

1864. By Lukáš Tinkl

Avoid sync DBUS calls
Approved by: Michael Zanetti

1865. By Michael Zanetti

Add PreviewSocialComment
Approved by: Albert Astals Cid, Josh Arenson

1866. By Marcus Tomlinson

Handle TERM, HUP, and INT signals in unity-scope-tool Fixes: #1470464
Approved by: Albert Astals Cid, Michi Henning

1867. By CI Train Bot Account

Releasing 8.10+15.10.20150717-0ubuntu1

1868. By CI Train Bot Account

Resync trunk.

1869. By Launchpad Translations on behalf of unity-team

Launchpad automatic translations update.

1870. By Josh Arenson

Add handling for the location page to the autopilot settings wizard test
Approved by: Albert Astals Cid

1871. By Albert Astals Cid

Update state of indicators bar only when the user is actively dragging himself

Fixes race with timer causing bug 1457044 Fixes: #1457044
Approved by: Nick Dedekind

1872. By Albert Astals Cid

PreviewExpandable should be not expanded on startup

Approved by: Andrea Cimitan

1873. By Albert Astals Cid

icon-actions preview widget

Approved by: Andrea Cimitan

1874. By Albert Astals Cid

Fix warning when doing make try*
Approved by: Andrea Cimitan

1875. By handsome_feng

Added touch state on navigation. Fixes: #1383213
Approved by: Mirco Müller

1876. By Albert Astals Cid

make testPageHeader more stable

Approved by: Andrea Cimitan

1877. By Albert Astals Cid

Fix i18n in scope tool

It had half of it but not completely, this is the counterpart for scope tool from r1247 Fixes: #1317541
Approved by: Andrea Cimitan

1878. By Albert Astals Cid

New phone background provided by design

Removes a 1 px bright line on its right edge Fixes: #1364537
Approved by: Andrea Cimitan

1879. By Michael Zanetti

allow opening the manage dash area by clicking with a mouse on the arrow label

This is meant to be temporary and will be replaced with the upcoming bottom edge
component in the UITK.
Approved by: Albert Astals Cid

1880. By Albert Astals Cid

Add context for "Please re-enter"

Translators need to know we're asking the user to reenter the passphrase Fixes: #1377195
Approved by: Andrea Cimitan

1881. By CI Train Bot Account

Releasing 8.10+15.10.20150721-0ubuntu1

1882. By CI Train Bot Account

Resync trunk.

1883. By Launchpad Translations on behalf of unity-team

Launchpad automatic translations update.

1884. By Launchpad Translations on behalf of unity-team

Launchpad automatic translations update.

1885. By Launchpad Translations on behalf of unity-team

Launchpad automatic translations update.

1886. By Gerry Boland

Bump version

1887. By Gerry Boland

Specify multimonitor orientation per device, change orientation even for desktop state when necessary

1888. By Gerry Boland

Merge mirSurface

1889. By Gerry Boland

Merge MousePointer

1890. By Gerry Boland

unity-api dep too high

1891. By Gerry Boland

Fuk you whitespace test

1892. By Gerry Boland

Merge trunk

1893. By Gerry Boland

update changelog

1894. By Gerry Boland

Merge trunk

1895. By Gerry Boland

Merge lp:~dandrader/unity8/multiSurfaceApp

1896. By Gerry Boland

Fix apps surfaces appearing

Unmerged revisions

1896. By Gerry Boland

Fix apps surfaces appearing

1895. By Gerry Boland

Merge lp:~dandrader/unity8/multiSurfaceApp

1894. By Gerry Boland

Merge trunk

1893. By Gerry Boland

update changelog

1892. By Gerry Boland

Merge trunk

1891. By Gerry Boland

Fuk you whitespace test

1890. By Gerry Boland

unity-api dep too high

1889. By Gerry Boland

Merge MousePointer

1888. By Gerry Boland

Merge mirSurface

1887. By Gerry Boland

Specify multimonitor orientation per device, change orientation even for desktop state when necessary

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches