Merge into trunk : launcher-sizing : Code : Unity 8

Reviewer	Review Type	Date Requested	Status
Lukáš Tinkl (community)		2016-02-17	Approve on 2016-02-22
Albert Astals Cid (community)		2016-02-17	Abstain on 2016-02-22
PS Jenkins bot	continuous-integration	2016-02-17	Needs Fixing on 2016-02-19
Unity8 CI Bot	continuous-integration	2016-02-17	Needs Fixing on 2016-02-19
Daniel d'Andrada		2016-02-17	Pending
Michał Sawicz			Pending
Michael Terry		2016-02-17	Pending
Review via email: mp+286396@code.launchpad.net

PS Jenkins bot (ps-jenkins) wrote on 2015-12-10: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Lukáš Tinkl (lukas-kde) wrote on 2015-12-10: Posted in a previous version of this proposal

#

Some tests failing:

qmltestrunner.Shell::test_focusAppFromLauncherExitsSpread
qmltestrunner.Shell::test_progressiveAutoScrolling
qmltestrunner.Shell::test_superTabToCycleLauncher

review: Needs Fixing

Lukáš Tinkl (lukas-kde) wrote on 2015-12-10: Posted in a previous version of this proposal

#

One minor comment inline, fix the gsettings description

PS Jenkins bot (ps-jenkins) wrote on 2015-12-10: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-12-11: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-12-11: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:2069
http://jenkins.qa.ubuntu.com/job/unity8-ci/6917/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5721
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/332/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1628
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/331
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1523
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1523
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/330
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/329
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4446
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5734
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5734/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25965
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/331/console

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2015-12-14: Posted in a previous version of this proposal

#

Text conflict in tests/qmltests/tst_Shell.qml
1 conflicts encountered.

PS Jenkins bot (ps-jenkins) wrote on 2015-12-15: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-12-15: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Michael Terry (mterry) wrote on 2015-12-17: Posted in a previous version of this proposal

#

I know this may be bending too far backwards, but have you considered re-using the unity7 gsettings locations for the launcher?

The org.compiz.unityshell schema, installed by the unity-schemas package, has a launcher-hide-mode key and a icon-size key. The former should work just fine for our needs. But the icon-size is specified in pixels. So if we used that key, maybe we'd do some clever (or dumb!) converting.

I know it's cleaner to use our own schema. But compatibility between the two DEs (both of which we make!) would be nice. But I'm not going to push very hard for it. :)

===

In Launcher.qml, when lockedVisible changes, this code immediately calls hide(). Do you want to trigger the dismiss timer instead? That way panel.preventHiding gets respected. And just calling hide() assumes that lockedVisible is tied to autohideEnabled. Which it is... But feels weird to have those be overlapping states and have Shell.qml be the one combining them.

How would you feel about renaming lockedVisible to something like visibleByDefault and just having it be set to "scenario == desktop"? And then having Launcher combine that state and autohideEnabled to do the right thing.

The current way is fine too. But maybe just use the dismiss trigger instead of hide() at least.

===

I also tested this on my phone and couldn't pull the launcher out. It just didn't come out when I swiped from the left... I probably did something wrong... Maybe I should do a fresh build, I just moved qml files into place (no c++ changes here or in pre-req, right?) since the debs from jenkins are 404 now. Have you tested this MP recently?

review: Needs Information

Michael Terry (mterry) wrote on 2015-12-17: Posted in a previous version of this proposal

#

Oh, duh. The gsettings schema. Need to make a deb I guess.

Michael Terry (mterry) wrote on 2015-12-17: Posted in a previous version of this proposal

#

OK... Now I see that autohideLauncher is in fact a separate property from Launcher.autohideEnabled. That confusion on my part drove me talking about the overlapping states above. I guess ignore that piece then.

Michael Terry (mterry) wrote on 2015-12-17: Posted in a previous version of this proposal

#

Maybe move the launcherSettings object into the main Shell object instead of the Launcher, since it is not a launcher-specific object?

The old GSettings object seems to have moved into a Unity8Settings override-able object on the OrientedShell... I guess someone figured that was easier to mock than our existing GSettings mocks? But that means it's not accessible from the base Shell now, hence why you needed to add your own GSettings object.

:(

===

Neither the pips nor the badge text changes size with the launcher icons. Is that intentional?

===

I'm getting "Damper::maxDelta must be a positive number. Aborted" when running xvfbtestLauncher/Shell. But I also get that on the Dash tests. I don't think that's related. Outside of xvfb works fine.

Michael Zanetti (mzanetti) wrote on 2015-12-18: Posted in a previous version of this proposal

#

re re-using the unity7 schema: I did try to keep compatibility in the launcher for a long time. However, given the drastic changes of how we work with app ids now, at some point I could not reuse the favorites key in there any more. Also this branch's requirements were quite different at some point, in a sense that we'd need to store different size configs for different usage modes, this might come back as a design request at any point. Last but not least, the px vs GU issue is another one why I think reusing is not the best idea. Even if I'd convert it, the setting is stored in pixels and will break if the use switches to a screen with different PX/GU.

===

re: hide() vs dismissTimer. using dismissTimer would cause the launcher to wait for some seconds before hiding when the user changes the setting in systemsettings, which I think would be a bit weird (unity7 hides it immediately on setting change too). You do have a point that if the user would have the mouse hovered on the launcher while changing the setting it would hide despite the user "interacting" with it. However, is it really a use case that the user interacts with the mouse on the launcher and uses, touch or cmdline to make the launcher hide at the same time? Hence my decision to go for hide() immediately, so the user gets immediate feedback when clicking on the (yet to be added in settings) checkbox.

===

re requiring a .deb for testing. I usually copy the schema to the device and call "sudo glib-compile-schemas /usr/share/glib-2.0/schemas" myself.

===

re moving GSettings around, yes, Daniel keeps on moving those things so he can mock them in QML instead of using the GSettingsController to control the mock... I think we should remove the Unity8Settings again, given that the only thing that we actually mock with that are already supported by our GSettingsControllerQML stuff. Also the workaround in Unity8Settings is not required any more as the fix for that landed by now. Given that touches quite some places tho, I'd vote for doing that in a different branch.

Anyhow, I've moved the GSettings object out of the launcher now and called it settings.

===

re pip and count emblems not scaling, yes, intentional. You couldn't read them any more at the smalles level and they'd be super huge on the biggest. I talked with design about that. we agreed to not scale them.

PS Jenkins bot (ps-jenkins) wrote on 2015-12-18: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Michael Terry (mterry) wrote on 2015-12-21: Posted in a previous version of this proposal

#

Alright then, sounds sensible. :)

I like the code changes, but looks like we have new failures in testShell at least? I get 15 new failures locally.

Michael Zanetti (mzanetti) wrote on 2016-01-08: Posted in a previous version of this proposal

#

fixed the tests.

Please note that I had to merge lp:~dandrader/unity8/fixDragHandleTest in order to make xvfbtestShell work at all. As I already have a prereq, that diff will show up here too. It should vanish after the next landing.

PS Jenkins bot (ps-jenkins) wrote on 2016-01-08: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Michael Terry (mterry) wrote on 2016-01-08: Posted in a previous version of this proposal

#

I also see a failure in tst_Launcher::test_clickFlick in jenkins, but I don't see it locally. Does that pass/fail for you?

PS Jenkins bot (ps-jenkins) wrote on 2016-01-08: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Michael Terry (mterry) wrote on 2016-01-08: Posted in a previous version of this proposal

#

Hrm. Jenkins failure went away... And I can't see it locally, so fine. :) Approved, thanks!

review: Approve

Albert Astals Cid (aacid) wrote on 2016-01-13: Posted in a previous version of this proposal

#

Text conflict in qml/Launcher/Launcher.qml
Text conflict in qml/Launcher/LauncherPanel.qml
2 conflicts encountered.

Was already top approved.

review: Needs Fixing

Michael Zanetti (mzanetti) wrote on 2016-01-13: Posted in a previous version of this proposal

#

> Text conflict in qml/Launcher/Launcher.qml
> Text conflict in qml/Launcher/LauncherPanel.qml
> 2 conflicts encountered.
>
> Was already top approved.

merged

PS Jenkins bot (ps-jenkins) wrote on 2016-01-13: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-13: Posted in a previous version of this proposal

#

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

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

review: Approve (continuous-integration)

Michael Terry (mterry) wrote on 2016-01-13: Posted in a previous version of this proposal

#

Looks good again, and CI bot says good!

Albert Astals Cid (aacid) wrote on 2016-01-14: Posted in a previous version of this proposal

#

Something went wrong

file:///home/tsdgeos_work/phablet/unity8/launcher-sizing/tests/qmltests/Launcher/tst_Launcher.qml:313:18: Duplicate method name
function assertFocusOnIndex(index) {

review: Needs Fixing

Lukáš Tinkl (lukas-kde) wrote on 2016-01-14: Posted in a previous version of this proposal

#

Found a small bug:

1. Alt+F1 to open the keyboard navigation
2. Press Down to highlight an item
3. Press Right to open the quicklist
4. Launch the app
5. The (keyboard) focus ring doesn't go away

review: Needs Fixing

Michael Terry (mterry) wrote on 2016-01-14: Posted in a previous version of this proposal

#

That's probably a bug in the pre-req: https://code.launchpad.net/~mzanetti/unity8/launcher-updates/+merge/278567

Lukáš Tinkl (lukas-kde) wrote on 2016-01-14: Posted in a previous version of this proposal

#

Hmm yes and no, it becomes obvious here now that the launcher stays locked visible in the desktop mode; tbh I don't recall seeing this when testing just the launcher-updates branch before

Lukáš Tinkl (lukas-kde) wrote on 2016-01-14: Posted in a previous version of this proposal

#

When switching between windows with Alt+Tab (while the launcher is locked visible), the launcher flashes/flickers

review: Needs Fixing

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-14: Posted in a previous version of this proposal

#

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

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

review: Approve (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2016-01-14: Posted in a previous version of this proposal

#

> Found a small bug:
>
> 1. Alt+F1 to open the keyboard navigation
> 2. Press Down to highlight an item
> 3. Press Right to open the quicklist
> 4. Launch the app
> 5. The (keyboard) focus ring doesn't go away
> review: Needs Fixing
> Reply
> Michael Terry (mterry) wrote 1 minute ago: #

> That's probably a bug in the pre-req: https://code.launchpad.net/~mzanetti/unity8/launcher-updates
> /+merge/278567

Indeed, fixed in the prereq and merged this

PS Jenkins bot (ps-jenkins) wrote on 2016-01-14: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) on 2016-01-14: Posted in a previous version of this proposal

#

review: Abstain (the broken merge is gone)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-14: Posted in a previous version of this proposal

#

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

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

review: Approve (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-14: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:2083
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/74/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

Lukáš Tinkl (lukas-kde) wrote on 2016-01-14: Posted in a previous version of this proposal

#

When having a fullscreen app (like camera or a webbrowser windows), the launcher should imho hide regardless of the visible-locked preference, just like the top panel does.

PS Jenkins bot (ps-jenkins) wrote on 2016-01-14: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-14: Posted in a previous version of this proposal

#

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

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

review: Approve (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-01-14: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-14: Posted in a previous version of this proposal

#

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

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

review: Approve (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2016-01-14: Posted in a previous version of this proposal

#

> When having a fullscreen app (like camera or a webbrowser windows), the
> launcher should imho hide regardless of the visible-locked preference, just
> like the top panel does.

done

PS Jenkins bot (ps-jenkins) wrote on 2016-01-14: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-15: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:2086
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/89/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

Lukáš Tinkl (lukas-kde) wrote on 2016-01-15: Posted in a previous version of this proposal

#

The flickering and fullscreen is fixed, great

Lukáš Tinkl (lukas-kde) wrote on 2016-01-15: Posted in a previous version of this proposal

#

Please remove the spurious bzr tags, otherwise no more objections

review: Needs Fixing

Michael Zanetti (mzanetti) wrote on 2016-01-15: Posted in a previous version of this proposal

#

> Please remove the spurious bzr tags, otherwise no more objections

done. must've been merged in after the initial proposal

Lukáš Tinkl (lukas-kde) wrote on 2016-01-15: Posted in a previous version of this proposal

#

LGTM, works fine now, minus some some havoc in LauncherModel (unrelated to this branch), gonna file a bug about it

* Did you perform an exploratory manual test run of the code change and any related functionality?

Yes!

* Did CI run pass? If not, please explain why.

Yes (all the relevant tests passing locally)

* Did you make sure that the branch does not contain spurious tags?

Yes

review: Approve

PS Jenkins bot (ps-jenkins) wrote on 2016-01-15: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-15: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:2086
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/89/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-15: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:2086
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/89/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-15: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:2086
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/89/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-02-02: Posted in a previous version of this proposal

#

Note: this was already top approved, re-approve after merge

Text conflict in qml/Components/PhysicalKeysMapper.qml
Text conflict in qml/Launcher/Launcher.qml
Text conflict in tests/qmltests/tst_Shell.qml
3 conflicts encountered.

review: Needs Fixing

Albert Astals Cid (aacid) wrote on 2016-02-02: Posted in a previous version of this proposal

#

Merges now, re-top-approving

review: Abstain

Michał Sawicz (saviq) wrote on 2016-02-05: Posted in a previous version of this proposal

#

I don't think "always-launcher" is as easy as resizing the desktop stage, it results in fullscreen^W apps moving about:

http://imgur.com/a/5wxlt

Non-fullscreen apps should probably get margins instead of the whole stage being moved about.

I'd vote for leaving the always-launcher feature out from this MP.

review: Needs Fixing

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-05: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:2089
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/288/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-05: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Michael Terry (mterry) wrote on 2016-02-09: Posted in a previous version of this proposal

#

- panel.dismissTimer.restart()
+ dismissTimer.restart()

Is that right?

review: Needs Information

Lukáš Tinkl (lukas-kde) wrote on 2016-02-10: Posted in a previous version of this proposal

#

qml/Launcher/Launcher.qml:98: ReferenceError: dismissTimer is not defined

Daniel d'Andrada (dandrader) wrote on 2016-02-10: Posted in a previous version of this proposal

#

Why to we need this new intermediate (id: stageContainer) Item in DesktopStage.qml?

review: Needs Information

Michael Zanetti (mzanetti) wrote on 2016-02-10: Posted in a previous version of this proposal

#

> Why to we need this new intermediate (id: stageContainer) Item in
> DesktopStage.qml?

because the area for the apps needs to be smaller when the launcher is always visible. that said, this might not be good enough yet.

Michael Zanetti (mzanetti) wrote on 2016-02-10: Posted in a previous version of this proposal

#

> - panel.dismissTimer.restart()
> + dismissTimer.restart()
>
> Is that right?

> qml/Launcher/Launcher.qml:98: ReferenceError: dismissTimer is not defined

bad merge, thanks. fixed

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-10: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:2090
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/309/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/430/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/453
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/471
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/471
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/467/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/467/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/467/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/467/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/467/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/467/console

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-10: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Daniel d'Andrada (dandrader) wrote on 2016-02-10: Posted in a previous version of this proposal

#

On 10/02/2016 14:31, Michael Zanetti wrote:
>> Why to we need this new intermediate (id: stageContainer) Item in
>> DesktopStage.qml?
> because the area for the apps needs to be smaller when the launcher is always visible. that said, this might not be good enough yet.

But the leftMargin is not being applied to it, but to appContainer instead.

Michael Zanetti (mzanetti) wrote on 2016-02-12: Posted in a previous version of this proposal

#

> On 10/02/2016 14:31, Michael Zanetti wrote:
> >> Why to we need this new intermediate (id: stageContainer) Item in
> >> DesktopStage.qml?
> > because the area for the apps needs to be smaller when the launcher is
> always visible. that said, this might not be good enough yet.
>
>
> But the leftMargin is not being applied to it, but to appContainer instead.

Right. So the inner container is for the margins. As the wallpaper can't have the same margins (it shines through the launcher), it can't be inside that container. The outer is used for snapshotting the whole thing in order to apply blur for the spread background. I guess we could make the background also act as the outer container and with that get rid of one item. Anyways, as I said, this doesn't seem to be good enough for switching between fullscreen and non-fullscreen apps yet. have to rework it a bit.

Lukáš Tinkl (lukas-kde) wrote on 2016-02-17: Posted in a previous version of this proposal

#

Yes, works good now, even with the spread and fullscreen apps

* Did you perform an exploratory manual test run of the code change and any related functionality?

Yes!

* Did CI run pass? If not, please explain why.

Yes (all the relevant tests passing locally)

* Did you make sure that the branch does not contain spurious tags?

Yes

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-17:

#

FAILED: Continuous integration, rev:2091
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/415/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/562/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/585
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/603
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/603
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/599/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/599/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/599/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/599/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/599/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/599/console

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-17:

#

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-19:

#

FAILED: Continuous integration, rev:2092
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/441/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/595/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/618
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/636
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/636
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/632/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/632/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/632/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/632/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/632/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/632/console

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-19:

#

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) on 2016-02-22:

#

review: Abstain

Lukáš Tinkl (lukas-kde) wrote on 2016-02-22:

#

Re-approving after prereq merge

review: Approve

Unity 8

Merge lp:~unity-team/unity8/launcher-sizing into lp:unity8

Commit Message

Description of the Change

Unmerged revisions

Preview Diff

Subscribers

 === 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-02-19 15:10:34 +0000
@@ -27,6 +27,17 @@
        <summary>Maximum push needed to overcome edge barrier</summary>
        <description>How much you have to push (in grid units) the mouse against an edge barrier when sensibility is 1.</description>
      </key>
++    <key type="b" name="autohide-launcher">
++      <default>false</default>
++      <summary>Autohide the launcher</summary>
++      <description>This will only be applied in windowed mode. In staged mode, the launcher will always hide.</description>
++    </key>
++    <key type="u" name="launcher-width">
++      <default>8</default>
++      <range min="6" max="12"/>
++      <summary>Width of the launcher in grid units.</summary>
++      <description>Changes the width of the launcher in all usage modes.</description>
++    </key>
    </schema>
    <schema path="/com/canonical/unity8/greeter/" id="com.canonical.Unity8.Greeter" gettext-domain="unity8">
 === modified file 'qml/Launcher/Launcher.qml'
 --- qml/Launcher/Launcher.qml	2016-02-19 15:10:33 +0000
 +++ qml/Launcher/Launcher.qml	2016-02-19 15:10:34 +0000
@@ -25,11 +25,12 @@
      id: root
      property bool autohideEnabled: false
++    property bool lockedVisible: false
      property bool available: true // can be used to disable all interactions
      property alias inverted: panel.inverted
      property bool shadeBackground: true // can be used to disable background shade when launcher is visible
--    property int panelWidth: units.gu(8)
++    property int panelWidth: units.gu(10)
      property int dragAreaWidth: units.gu(1)
      property int minimizeDistance: units.gu(26)
      property real progress: dragArea.dragging && dragArea.touchX > panelWidth ?
@@ -92,12 +93,24 @@
+         }
+     }
++    onLockedVisibleChanged: {
++        if (lockedVisible && state == "") {
++            panel.dismissTimer.stop();
++            fadeOutAnimation.stop();
++            switchToNextState("visible")
++        } else if (!lockedVisible && state == "visible") {
++            hide();
++        }
++    }
++
      function hide() {
          switchToNextState("")
+     }
      function fadeOut() {
--        fadeOutAnimation.start();
++        if (!root.lockedVisible) {
++            fadeOutAnimation.start();
++        }
+     }
      function switchToNextState(state) {
@@ -172,7 +185,7 @@
              } else if (panel.highlightIndex >= 0) {
                  launcherApplicationSelected(LauncherModel.get(panel.highlightIndex).appId);
+             }
--            root.state = ""
++            root.hide();
              event.accepted = true;
              root.focus = false;
+         }
@@ -211,6 +224,13 @@
          interval: 1
          property string nextState: ""
          onTriggered: {
++            if (root.lockedVisible && nextState == "") {
++                // Due to binding updates when switching between modes
++                // it could happen that our request to show will be overwritten
++                // with a hide request. Rewrite it when we know hiding is not allowed.
++                nextState = "visible"
++            }
++
              // switching to an intermediate state here to make sure all the
              // values are restored, even if we were already in the target state
              root.state = "tmp"
@@ -256,7 +276,7 @@
      MouseArea {
          id: launcherDragArea
--        enabled: root.available && (root.state == "visible" || root.state == "visibleTemporary")
++        enabled: root.available && (root.state == "visible" || root.state == "visibleTemporary") && !root.lockedVisible
          anchors.fill: panel
          anchors.rightMargin: -units.gu(2)
          drag {
@@ -277,9 +297,10 @@
      InverseMouseArea {
          id: closeMouseArea
          anchors.fill: panel
--        enabled: root.shadeBackground && root.state == "visible"
++        enabled: root.shadeBackground && root.state == "visible" && (!root.lockedVisible || panel.highlightIndex >= -1)
          visible: enabled
          onPressed: {
++            panel.highlightIndex = -2
              root.hide();
+         }
+     }
@@ -288,7 +309,7 @@
          id: backgroundShade
          anchors.fill: parent
          color: "black"
--        opacity: root.shadeBackground && root.state == "visible" ? 0.6 : 0
++        opacity: root.shadeBackground && root.state == "visible" && !root.lockedVisible ? 0.6 : 0
          Behavior on opacity { NumberAnimation { duration: UbuntuAnimation.BriskDuration } }
+     }
@@ -332,9 +353,9 @@
          Connections {
              target: panel.dismissTimer
              onTriggered: {
--                if (root.autohideEnabled) {
++                if (root.autohideEnabled && !root.lockedVisible) {
                      if (!panel.preventHiding) {
--                        root.state = ""
++                        root.hide();
                      } else {
                          panel.dismissTimer.restart()
+                     }
@@ -345,11 +366,11 @@
          property bool animate: true
          onApplicationSelected: {
--            root.state = ""
++            root.hide();
              launcherApplicationSelected(appId)
+         }
          onShowDashHome: {
--            root.state = ""
++            root.hide();
              root.showDashHome();
+         }
@@ -360,7 +381,8 @@
+         }
          onKbdNavigationCancelled: {
--            root.state = "";
++            panel.highlightIndex = -2;
++            root.hide();
              root.focus = false;
+         }
 === modified file 'qml/Launcher/LauncherDelegate.qml'
 --- qml/Launcher/LauncherDelegate.qml	2016-02-19 15:10:33 +0000
 +++ qml/Launcher/LauncherDelegate.qml	2016-02-19 15:10:34 +0000
@@ -124,7 +124,7 @@
      Item {
          id: iconItem
--        width: parent.itemWidth + units.gu(1)
++        width: root.width
          height: parent.itemHeight + units.gu(1)
          anchors.centerIn: parent
@@ -142,7 +142,7 @@
          ProportionalShape {
              id: iconShape
              anchors.centerIn: parent
--            width: parent.width - units.gu(2)
++            width: root.itemWidth
              aspect: UbuntuShape.DropShadow
              source: Image {
                  id: iconImage
@@ -158,7 +158,8 @@
              anchors {
                  right: parent.right
                  bottom: parent.bottom
--                margins: units.dp(3)
++                rightMargin: (iconItem.width - root.itemWidth) / 2 - units.dp(2)
++                margins: units.dp(5)
+             }
              width: Math.min(root.itemWidth, Math.max(units.gu(2), countLabel.implicitWidth + units.gu(1)))
              height: units.gu(2)
@@ -186,16 +187,11 @@
              id: progressOverlay
              objectName: "progressOverlay"
--            anchors {
--                left: iconItem.left
--                right: iconItem.right
--                verticalCenter: parent.verticalCenter
--                leftMargin: units.gu(1.5)
--                rightMargin: units.gu(1.5)
--            }
++            anchors.centerIn: parent
++            width: root.itemWidth * .8
              height: units.gu(1)
              visible: root.progress > -1
--            color: UbuntuColors.darkGrey
++            backgroundColor: UbuntuColors.darkGrey
              borderSource: "none"
              Item {
@@ -213,7 +209,7 @@
                          top: parent.top
                          bottom: parent.bottom
+                     }
--                    color: "white"
++                    backgroundColor: "white"
                      borderSource: "none"
                      width: progressOverlay.width
+                 }
 === modified file 'qml/Launcher/LauncherPanel.qml'
 --- qml/Launcher/LauncherPanel.qml	2016-02-19 15:10:33 +0000
 +++ qml/Launcher/LauncherPanel.qml	2016-02-19 15:10:34 +0000
@@ -53,14 +53,14 @@
          if (highlightIndex >= launcherListView.count) {
              highlightIndex = -1;
+         }
--        moveAnimation.moveToIndex(Math.max(highlightIndex, 0));
++        launcherListView.moveToIndex(Math.max(highlightIndex, 0));
+     }
      function highlightPrevious() {
          highlightIndex--;
          if (highlightIndex <= -2) {
              highlightIndex = launcherListView.count - 1;
+         }
--        moveAnimation.moveToIndex(Math.max(highlightIndex, 0));
++        launcherListView.moveToIndex(Math.max(highlightIndex, 0));
+     }
      function openQuicklist(index) {
          quickList.open(index);
@@ -83,13 +83,13 @@
          Rectangle {
              objectName: "buttonShowDashHome"
              width: parent.width
--            height: units.gu(7)
++            height: width * .9
              color: UbuntuColors.orange
              readonly property bool highlighted: root.highlightIndex == -1;
              Image {
                  objectName: "dashItem"
--                width: units.gu(5)
++                width: parent.width * .6
                  height: width
                  anchors.centerIn: parent
                  source: "graphics/home.png"
@@ -125,10 +125,8 @@
                      objectName: "launcherListView"
                      anchors {
                          fill: parent
--                        topMargin: -extensionSize + units.gu(0.5)
--                        bottomMargin: -extensionSize + units.gu(1)
--                        leftMargin: units.gu(0.5)
--                        rightMargin: units.gu(0.5)
++                        topMargin: -extensionSize + width * .15
++                        bottomMargin: -extensionSize + width * .15
+                     }
                      topMargin: extensionSize
                      bottomMargin: extensionSize
@@ -163,11 +161,11 @@
+                     }
                      // The height of the area where icons start getting folded
--                    property int foldingStartHeight: units.gu(6.5)
++                    property int foldingStartHeight: itemHeight
                      // The height of the area where the items reach the final folding angle
                      property int foldingStopHeight: foldingStartHeight - itemHeight - spacing
--                    property int itemWidth: units.gu(7)
--                    property int itemHeight: units.gu(6.5)
++                    property int itemWidth: width * .75
++                    property int itemHeight: itemWidth * 15 / 16 + units.gu(1)
                      property int clickFlickSpeed: units.gu(60)
                      property int draggedIndex: dndArea.draggedIndex
                      property real realContentY: contentY - originY + topMargin
@@ -195,22 +193,24 @@
                      UbuntuNumberAnimation {
                          id: moveAnimation
++                        objectName: "moveAnimation"
                          target: launcherListView
                          property: "contentY"
                          function moveTo(contentY) {
                              from = launcherListView.contentY;
                              to = contentY;
--                            start();
++                            restart();
+                         }
--                        function moveToIndex(index) {
--                            var itemPosition = index * launcherListView.itemHeight;
--                            var height = launcherListView.height - launcherListView.topMargin - launcherListView.bottomMargin
--                            var distanceToEnd = index == 0 || index == launcherListView.count - 1 ? 0 : launcherListView.itemHeight
--                            if (itemPosition + launcherListView.itemHeight + distanceToEnd > launcherListView.contentY + launcherListView.topMargin + height) {
--                                moveAnimation.moveTo(itemPosition + launcherListView.itemHeight - launcherListView.topMargin - height + distanceToEnd);
--                            } else if (itemPosition - distanceToEnd < launcherListView.contentY + launcherListView.topMargin) {
--                                moveAnimation.moveTo(itemPosition - distanceToEnd - launcherListView.topMargin);
--                            }
++                    }
++                    function moveToIndex(index) {
++                        var totalItemHeight = launcherListView.itemHeight + launcherListView.spacing
++                        var itemPosition = index * totalItemHeight;
++                        var height = launcherListView.height - launcherListView.topMargin - launcherListView.bottomMargin
++                        var distanceToEnd = index == 0 || index == launcherListView.count - 1 ? 0 : totalItemHeight
++                        if (itemPosition + totalItemHeight + distanceToEnd > launcherListView.contentY + launcherListView.originY + launcherListView.topMargin + height) {
++                            moveAnimation.moveTo(itemPosition + launcherListView.itemHeight - launcherListView.topMargin - height + distanceToEnd - launcherListView.originY);
++                        } else if (itemPosition - distanceToEnd < launcherListView.contentY - launcherListView.originY + launcherListView.topMargin) {
++                            moveAnimation.moveTo(itemPosition - distanceToEnd - launcherListView.topMargin + launcherListView.originY);
+                         }
+                     }
@@ -228,7 +228,7 @@
                          itemIndex: index
                          itemHeight: launcherListView.itemHeight
                          itemWidth: launcherListView.itemWidth
--                        width: itemWidth
++                        width: parent.width
                          height: itemHeight
                          iconName: model.icon
                          count: model.count
@@ -277,7 +277,7 @@
                          onAlertingChanged: {
                              if(alerting) {
                                  if (!dragging && (launcherListView.peekingIndex === -1 || launcher.visibleWidth > 0)) {
--                                    moveAnimation.moveToIndex(index)
++                                    launcherListView.moveToIndex(index)
                                      if (!dragging && launcher.state !== "visible") {
                                          peekingAnimation.start()
+                                     }
@@ -439,10 +439,8 @@
                              // First/last item do the scrolling at more than 12 degrees
                              if (index == 0 || index == launcherListView.count - 1) {
--                                if (clickedItem.angle > 12) {
--                                    launcherListView.flick(0, -launcherListView.clickFlickSpeed);
--                                } else if (clickedItem.angle < -12) {
--                                    launcherListView.flick(0, launcherListView.clickFlickSpeed);
++                                if (clickedItem.angle > 12 || clickedItem.angle < -12) {
++                                    launcherListView.moveToIndex(index);
                                  } else {
                                      root.applicationSelected(LauncherModel.get(index).appId);
+                                 }
@@ -450,10 +448,8 @@
+                             }
                              // the rest launches apps up to an angle of 30 degrees
--                            if (clickedItem.angle > 30) {
--                                launcherListView.flick(0, -launcherListView.clickFlickSpeed);
--                            } else if (clickedItem.angle < -30) {
--                                launcherListView.flick(0, launcherListView.clickFlickSpeed);
++                            if (clickedItem.angle > 30 || clickedItem.angle < -30) {
++                                launcherListView.moveToIndex(index);
                              } else {
                                  root.applicationSelected(LauncherModel.get(index).appId);
+                             }
@@ -668,7 +664,6 @@
          onClicked: {
              quickList.state = "";
              quickList.focus = false;
--            root.highlightIndex = -2;
              root.kbdNavigationCancelled();
+         }
@@ -739,16 +734,21 @@
              case Qt.Key_Left:
              case Qt.Key_Escape:
                  quickList.selectedIndex = -1;
--                // Falling through intentionally
++                quickList.focus = false;
++                quickList.state = ""
++                event.accepted = true;
++                break;
              case Qt.Key_Enter:
              case Qt.Key_Return:
              case Qt.Key_Space:
                  if (quickList.selectedIndex >= 0) {
                      LauncherModel.quickListActionInvoked(quickList.appId, quickList.selectedIndex)
+                 }
++                quickList.selectedIndex = -1;
                  quickList.focus = false;
                  quickList.state = ""
--                // Don't consume the event. We want to close the Launcher too, not just the quicklist.
++                root.kbdNavigationCancelled();
++                event.accepted = true;
                  break;
+             }
+         }
 === modified file 'qml/Shell.qml'
 --- qml/Shell.qml	2016-02-19 15:10:33 +0000
 +++ qml/Shell.qml	2016-02-19 15:10:34 +0000
@@ -25,6 +25,7 @@
  import Unity.Connectivity 0.1
  import Unity.Launcher 0.1
  import GlobalShortcut 1.0 // has to be before Utils, because of WindowKeysFilter
++import GSettings 1.0
  import Utils 0.1
  import Powerd 0.1
  import SessionBroadcast 0.1
@@ -187,6 +188,11 @@
+         }
+     }
++    GSettings {
++        id: settings
++        schema.id: "com.canonical.Unity8"
++    }
++
      Item {
          id: stages
          objectName: "stages"
@@ -343,6 +349,11 @@
                  property: "altTabPressed"
                  value: physicalKeysMapper.altTabPressed
+             }
++            Binding {
++                target: applicationsDisplayLoader.item
++                property: "leftMargin"
++                value: shell.usageScenario == "desktop" && !settings.autohideLauncher ? launcher.panelWidth: 0
++            }
+         }
          Tutorial {
@@ -373,7 +384,11 @@
      InputMethod {
          id: inputMethod
          objectName: "inputMethod"
--        anchors { fill: parent; topMargin: panel.panelHeight }
++        anchors {
++            fill: parent
++            topMargin: panel.panelHeight
++            leftMargin: launcher.lockedVisible ? launcher.panelWidth : 0
++        }
          z: notifications.useModal || panel.indicators.shown || wizard.active ? overlay.z + 1 : overlay.z - 1
+     }
@@ -559,6 +574,8 @@
              shadeBackground: !tutorial.running
              superPressed: physicalKeysMapper.superPressed
              superTabPressed: physicalKeysMapper.superTabPressed
++            panelWidth: units.gu(settings.launcherWidth)
++            lockedVisible: shell.usageScenario == "desktop" && !settings.autohideLauncher && !panel.fullscreenMode
              onShowDashHome: showHome()
              onDash: showDash()
 === modified file 'qml/Stages/AbstractStage.qml'
 --- qml/Stages/AbstractStage.qml	2016-02-19 15:10:33 +0000
 +++ qml/Stages/AbstractStage.qml	2016-02-19 15:10:34 +0000
@@ -42,6 +42,8 @@
      property int shellOrientationAngle
      property bool spreadEnabled: true // If false, animations and right edge will be disabled
      property bool suspended
++     // A Stage should paint a wallpaper etc over its full size but not use the margins for window placement
++    property int leftMargin: 0
      // To be read from outside
      property var mainApp: null
 === modified file 'qml/Stages/DesktopStage.qml'
 --- qml/Stages/DesktopStage.qml	2016-02-19 15:10:33 +0000
 +++ qml/Stages/DesktopStage.qml	2016-02-19 15:10:34 +0000
@@ -226,6 +226,7 @@
          PanelState.dropShadow = false;
+     }
++
      FocusScope {
          id: appContainer
          objectName: "appContainer"
@@ -297,6 +298,7 @@
                  visible: !visuallyMinimized &&
                           !greeter.fullyShown &&
                           (priv.foregroundMaximizedAppZ === -1 || priv.foregroundMaximizedAppZ <= z) ||
++                         decoratedWindow.fullscreen ||
                           (spread.state == "altTab" && index === spread.highlightedIndex)
                  Binding {
@@ -368,10 +370,10 @@
                  states: [
                      State {
                          name: "fullscreen"; when: decoratedWindow.fullscreen
--                        extend: "maximized"
                          PropertyChanges {
                              target: appDelegate;
--                            y: -PanelState.panelHeight
++                            x: 0; y: -PanelState.panelHeight
++                            requestedWidth: appContainer.width; requestedHeight: appContainer.height;
+                         }
                      },
                      State {
@@ -388,21 +390,21 @@
                          name: "maximized"; when: appDelegate.maximized && !appDelegate.minimized
                          PropertyChanges {
                              target: appDelegate;
--                            x: 0; y: 0;
--                            requestedWidth: root.width; requestedHeight: root.height;
++                            x: root.leftMargin; y: 0;
++                            requestedWidth: appContainer.width - root.leftMargin; requestedHeight: appContainer.height;
                              visuallyMinimized: false;
                              visuallyMaximized: true
+                         }
                      },
                      State {
                          name: "maximizedLeft"; when: appDelegate.maximizedLeft && !appDelegate.minimized
--                        PropertyChanges { target: appDelegate; x: 0; y: PanelState.panelHeight;
--                            requestedWidth: root.width/2; requestedHeight: root.height - PanelState.panelHeight }
++                        PropertyChanges { target: appDelegate; x: root.leftMargin; y: PanelState.panelHeight;
++                            requestedWidth: (appContainer.width - root.leftMargin)/2; requestedHeight: appContainer.height - PanelState.panelHeight }
                      },
                      State {
                          name: "maximizedRight"; when: appDelegate.maximizedRight && !appDelegate.minimized
--                        PropertyChanges { target: appDelegate; x: root.width/2; y: PanelState.panelHeight;
--                            requestedWidth: root.width/2; requestedHeight: root.height - PanelState.panelHeight }
++                        PropertyChanges { target: appDelegate; x: (appContainer.width + root.leftMargin)/2; y: PanelState.panelHeight;
++                            requestedWidth: (appContainer.width - root.leftMargin)/2; requestedHeight: appContainer.height - PanelState.panelHeight }
                      },
                      State {
                          name: "minimized"; when: appDelegate.minimized
@@ -465,8 +467,9 @@
                      minHeight: units.gu(10)
                      borderThickness: units.gu(2)
                      windowId: model.appId // FIXME: Change this to point to windowId once we have such a thing
--                    screenWidth: root.width
--                    screenHeight: root.height
++                    screenWidth: appContainer.width
++                    screenHeight: appContainer.height
++                    leftMargin: root.leftMargin
                      onPressed: { ApplicationManager.focusApplication(model.appId) }
+                 }
@@ -523,7 +526,7 @@
      DesktopSpread {
          id: spread
          objectName: "spread"
--        anchors.fill: parent
++        anchors.fill: appContainer
          workspace: appContainer
          focus: state == "altTab"
          altTabPressed: root.altTabPressed
 === modified file 'qml/Stages/WindowResizeArea.qml'
 --- qml/Stages/WindowResizeArea.qml	2016-02-03 14:00:47 +0000
 +++ qml/Stages/WindowResizeArea.qml	2016-02-19 15:10:34 +0000
@@ -40,6 +40,7 @@
      property int defaultHeight: units.gu(50)
      property int screenWidth: 0
      property int screenHeight: 0
++    property int leftMargin: 0
      QtObject {
          id: priv
@@ -72,9 +73,9 @@
          var windowGeometry = windowStateStorage.getGeometry(root.windowId,
                                                              Qt.rect(target.x, target.y, defaultWidth, defaultHeight));
--        target.requestedWidth = Math.min(Math.max(windowGeometry.width, d.minimumWidth), screenWidth);
++        target.requestedWidth = Math.min(Math.max(windowGeometry.width, d.minimumWidth), screenWidth - root.leftMargin);
          target.requestedHeight = Math.min(Math.max(windowGeometry.height, d.minimumHeight), root.screenHeight - PanelState.panelHeight);
--        target.x = Math.max(Math.min(windowGeometry.x, root.screenWidth - target.requestedWidth), 0)
++        target.x = Math.max(Math.min(windowGeometry.x, root.screenWidth - root.leftMargin - target.requestedWidth), root.leftMargin)
          target.y = Math.max(Math.min(windowGeometry.y, root.screenHeight - target.requestedHeight), PanelState.panelHeight)
          var windowState = windowStateStorage.getState(root.windowId, WindowStateStorage.WindowStateNormal)
 === modified file 'tests/mocks/GSettings.1.0/fake_gsettings.cpp'
 --- tests/mocks/GSettings.1.0/fake_gsettings.cpp	2015-09-29 20:19:56 +0000
 +++ tests/mocks/GSettings.1.0/fake_gsettings.cpp	2016-02-19 15:10:34 +0000
@@ -22,6 +22,8 @@
  GSettingsControllerQml::GSettingsControllerQml()
      : m_usageMode("Staged")
++    , m_autohideLauncher(false)
++    , m_launcherWidth(8)
+ {
+ }
@@ -88,6 +90,32 @@
+     }
+ }
++bool GSettingsControllerQml::autohideLauncher() const
++{
++    return m_autohideLauncher;
++}
++
++void GSettingsControllerQml::setAutohideLauncher(bool autohideLauncher)
++{
++    if (m_autohideLauncher != autohideLauncher) {
++        m_autohideLauncher = autohideLauncher;
++        Q_EMIT autohideLauncherChanged(autohideLauncher);
++    }
++}
++
++int GSettingsControllerQml::launcherWidth() const
++{
++    return m_launcherWidth;
++}
++
++void GSettingsControllerQml::setLauncherWidth(int launcherWidth)
++{
++    if (m_launcherWidth != launcherWidth) {
++        m_launcherWidth = launcherWidth;
++        Q_EMIT launcherWidthChanged(launcherWidth);
++    }
++}
++
  GSettingsSchemaQml::GSettingsSchemaQml(QObject *parent): QObject(parent) {
+ }
@@ -129,6 +157,10 @@
              this, &GSettingsQml::lockedOutTimeChanged);
      connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::lifecycleExemptAppidsChanged,
              this, &GSettingsQml::lifecycleExemptAppidsChanged);
++    connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::autohideLauncherChanged,
++            this, &GSettingsQml::autohideLauncherChanged);
++    connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::launcherWidthChanged,
++            this, &GSettingsQml::launcherWidthChanged);
+ }
  GSettingsSchemaQml * GSettingsQml::schema() const {
@@ -192,9 +224,41 @@
+     }
+ }
++bool GSettingsQml::autohideLauncher() const
++{
++    if (m_schema->id() == "com.canonical.Unity8") {
++        return GSettingsControllerQml::instance()->autohideLauncher();
++    } else {
++        return false;
++    }
++}
++
++int GSettingsQml::launcherWidth() const
++{
++    if (m_schema->id() == "com.canonical.Unity8") {
++        return GSettingsControllerQml::instance()->launcherWidth();
++    } else {
++        return false;
++    }
++}
++
  void GSettingsQml::setLifecycleExemptAppids(const QStringList &appIds)
+ {
      if (m_schema->id() == "com.canonical.qtmir") {
          GSettingsControllerQml::instance()->setLifecycleExemptAppids(appIds);
+     }
+ }
++
++void GSettingsQml::setAutohideLauncher(bool autohideLauncher)
++{
++    if (m_schema->id() == "com.canonical.Unity8") {
++        GSettingsControllerQml::instance()->setAutohideLauncher(autohideLauncher);
++    }
++}
++
++void GSettingsQml::setLauncherWidth(int launcherWidth)
++{
++    if (m_schema->id() == "com.canonical.Unity8") {
++        GSettingsControllerQml::instance()->setLauncherWidth(launcherWidth);
++    }
++}
 === modified file 'tests/mocks/GSettings.1.0/fake_gsettings.h'
 --- tests/mocks/GSettings.1.0/fake_gsettings.h	2015-09-29 20:19:56 +0000
 +++ tests/mocks/GSettings.1.0/fake_gsettings.h	2016-02-19 15:10:34 +0000
@@ -50,6 +50,8 @@
      Q_PROPERTY(QString usageMode READ usageMode WRITE setUsageMode NOTIFY usageModeChanged)
      Q_PROPERTY(qint64 lockedOutTime READ lockedOutTime WRITE setLockedOutTime NOTIFY lockedOutTimeChanged)
      Q_PROPERTY(QStringList lifecycleExemptAppids READ lifecycleExemptAppids WRITE setLifecycleExemptAppids NOTIFY lifecycleExemptAppidsChanged)
++    Q_PROPERTY(bool autohideLauncher READ autohideLauncher WRITE setAutohideLauncher NOTIFY autohideLauncherChanged)
++    Q_PROPERTY(int launcherWidth READ launcherWidth WRITE setLauncherWidth NOTIFY launcherWidthChanged)
  public:
      GSettingsQml(QObject *parent = nullptr);
@@ -59,11 +61,15 @@
      QString usageMode() const;
      qint64 lockedOutTime() const;
      QStringList lifecycleExemptAppids() const;
++    bool autohideLauncher() const;
++    int launcherWidth() const;
      void setPictureUri(const QString &str);
      void setUsageMode(const QString &usageMode);
      void setLockedOutTime(qint64 timestamp);
      void setLifecycleExemptAppids(const QStringList &appIds);
++    void setAutohideLauncher(bool autohideLauncher);
++    void setLauncherWidth(int launcherWidth);
  Q_SIGNALS:
      void schemaChanged();
@@ -71,6 +77,8 @@
      void usageModeChanged(const QString&);
      void lockedOutTimeChanged(qint64);
      void lifecycleExemptAppidsChanged(const QStringList &);
++    void autohideLauncherChanged(bool);
++    void launcherWidthChanged(int launcherWidth);
  private:
      GSettingsSchemaQml* m_schema;
@@ -98,11 +106,19 @@
      QStringList lifecycleExemptAppids() const;
      Q_INVOKABLE void setLifecycleExemptAppids(const QStringList &appIds);
++    bool autohideLauncher() const;
++    Q_INVOKABLE void setAutohideLauncher(bool autohideLauncher);
++
++    int launcherWidth() const;
++    Q_INVOKABLE void setLauncherWidth(int launcherWidth);
++
  Q_SIGNALS:
      void pictureUriChanged(const QString&);
      void usageModeChanged(const QString&);
      void lockedOutTimeChanged(qint64 timestamp);
      void lifecycleExemptAppidsChanged(const QStringList&);
++    void autohideLauncherChanged(bool autohideLauncher);
++    void launcherWidthChanged(int launcherWidth);
  private:
      GSettingsControllerQml();
@@ -111,6 +127,8 @@
      QString m_usageMode;
      qint64 m_lockedOutTime;
      QStringList m_lifecycleExemptAppids;
++    bool m_autohideLauncher;
++    int m_launcherWidth;
      static GSettingsControllerQml* s_controllerInstance;
      QList<GSettingsQml *> m_registeredGSettings;
 === modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
 --- tests/qmltests/Launcher/tst_Launcher.qml	2016-02-19 15:10:33 +0000
 +++ tests/qmltests/Launcher/tst_Launcher.qml	2016-02-19 15:10:34 +0000
@@ -28,8 +28,8 @@
     launcher. */
  Item {
      id: root
--    width: units.gu(50)
--    height: units.gu(55)
++    width: units.gu(140)
++    height: units.gu(70)
      Loader {
          id: launcherLoader
@@ -79,11 +79,40 @@
+         }
+     }
++    Binding {
++        target: launcherLoader.item
++        property: "lockedVisible"
++        value: lockedVisibleCheckBox.checked
++    }
++    Binding {
++        target: launcherLoader.item
++        property: "panelWidth"
++        value: units.gu(Math.round(widthSlider.value))
++    }
++
      ColumnLayout {
          anchors { bottom: parent.bottom; right: parent.right; margins: units.gu(1) }
          spacing: units.gu(1)
          width: childrenRect.width
++        RowLayout {
++            CheckBox {
++                id: lockedVisibleCheckBox
++                checked: false
++            }
++            Label {
++                text: "Launcher always visible"
++            }
++        }
++
++        Slider {
++            id: widthSlider
++            Layout.fillWidth: true
++            minimumValue: 6
++            maximumValue: 12
++            value: 10
++        }
++
          MouseTouchEmulationCheckbox {}
          EdgeBarrierControls {
@@ -217,10 +246,6 @@
              // growing while populating it with icons etc.
              tryCompare(listView, "flicking", false);
--            // Make sure noone changed the height of the window. The issue this test case
--            // is verifying only happens on certain heights of the Launcher
--            compare(root.height, units.gu(55));
--
              compare(listView.contentY, -listView.topMargin, "Launcher did not start up with first item unfolded");
              // Now do check that snapping is in fact enabled
@@ -277,14 +302,21 @@
          function positionLauncherListAtBeginning() {
              var listView = testCase.findChild(launcherLoader.item, "launcherListView");
--            listView.contentY = -listView.topMargin;
++            var moveAnimation = findInvisibleChild(listView, "moveAnimation")
++
++            listView.moveToIndex(0);
++
++            waitForRendering(listView);
++            tryCompare(moveAnimation, "running", false);
+         }
          function positionLauncherListAtEnd() {
              var listView = testCase.findChild(launcherLoader.item, "launcherListView");
--            if ((listView.contentHeight + listView.topMargin + listView.bottomMargin) > listView.height) {
--                listView.contentY = listView.topMargin + listView.contentHeight
--                    - listView.height;
--            }
++            var moveAnimation = findInvisibleChild(listView, "moveAnimation")
++
++            listView.moveToIndex(listView.count -1);
++
++            waitForRendering(listView);
++            tryCompare(moveAnimation, "running", false);
+         }
          function assertFocusOnIndex(index) {
@@ -292,10 +324,10 @@
              var bfbFocusHighlight = findChild(launcher, "bfbFocusHighlight");
              waitForRendering(launcher);
--            tryCompare(bfbFocusHighlight, "visible", index === -1);
++            compare(bfbFocusHighlight.visible, index === -1);
              for (var i = 0; i < launcherListView.count; i++) {
                  var focusRing = findChild(findChild(launcher, "launcherDelegate" + i), "focusRing")
--                tryCompare(focusRing, "visible", index === i);
++                compare(focusRing.visible, index === i);
+             }
+         }
@@ -400,6 +432,7 @@
                  wait(100)
                  compare(launcher.maxPanelX, -launcher.panelWidth, "Launcher moved even if it shouldn't")
+             }
++
              waitUntilLauncherDisappears();
              launcher.available = true;
+         }
@@ -423,6 +456,8 @@
              dragLauncherIntoView();
              var launcherListView = findChild(launcher, "launcherListView");
              for (var i = 0; i < launcherListView.count; ++i) {
++                launcherListView.moveToIndex(i);
++                waitForRendering(launcherListView);
                  var delegate = findChild(launcherListView, "launcherDelegate" + i)
                  compare(findChild(delegate, "countEmblem").visible, LauncherModel.get(i).countVisible)
                  // Intentionally allow type coercion (string/number)
@@ -483,6 +518,7 @@
              launcher.lastSelectedApplication = "";
              dragLauncherIntoView();
              var listView = findChild(launcher, "launcherListView");
++            var moveAnimation = findInvisibleChild(listView, "moveAnimation")
              // flicking is unreliable. sometimes it works, sometimes the
              // list view moves just a tiny bit or not at all, making tests fail.
@@ -493,12 +529,14 @@
              } else {
                  positionLauncherListAtEnd();
+             }
--            tryCompare(listView, "flicking", false);
--
              var oldY = listView.contentY;
              mouseClick(listView, listView.width / 2, data.clickY);
--            tryCompare(listView, "flicking", false);
++
++            if (data.expectFlick) {
++                tryCompare(moveAnimation, "running", true);
++            }
++            tryCompare(moveAnimation, "running", false);
              if (data.expectFlick) {
                  verify(listView.contentY != oldY);
@@ -1086,12 +1124,15 @@
          function test_keyboardNavigation() {
              var bfbFocusHighlight = findChild(launcher, "bfbFocusHighlight");
              var quickList = findChild(launcher, "quickList");
++            var launcherPanel = findChild(launcher, "launcherPanel");
              var launcherListView = findChild(launcher, "launcherListView");
              var last = launcherListView.count - 1;
              compare(bfbFocusHighlight.visible, false);
              launcher.openForKeyboardNavigation();
++            tryCompare(launcherPanel, "x", 0);
++            waitForRendering(launcher);
              assertFocusOnIndex(-1);
@@ -1164,11 +1205,47 @@
              compare(signalSpy.count, 1, "Quicklist signal wasn't triggered")
              compare(signalSpy.signalArguments[0][0], LauncherModel.get(1).appId)
              compare(signalSpy.signalArguments[0][1], 2)
--        }
--
--        function test_cancelKbdNavigationWitMouse() {
++            assertFocusOnIndex(-2);
++        }
++
++        function test_hideNotWorkingWhenLockedOut_data() {
++            return [
++                {tag: "locked visible", locked: true},
++                {tag: "no locked visible", locked: false},
++            ]
++        }
++
++        function test_hideNotWorkingWhenLockedOut(data) {
++            launcher.lockedVisible = data.locked;
++            if (data.locked) {
++                tryCompare(launcher, "state", "visible");
++            } else {
++                tryCompare(launcher, "state", "");
++            }
++
++            launcher.hide();
++            waitForRendering(launcher);
++            if (data.locked) {
++                verify(launcher.state == "visible");
++            } else {
++                verify(launcher.state == "");
++            }
++        }
++
++        function test_cancelKbdNavigationWitMouse_data() {
++            return [
++                        {tag: "locked out - no quicklist", autohide: false, withQuickList: false },
++                        {tag: "locked out - with quicklist", autohide: false, withQuickList: true },
++                        {tag: "autohide - no quicklist", autohide: true, withQuickList: false },
++                        {tag: "autohide - with quicklist", autohide: true, withQuickList: true },
++            ]
++        }
++
++        function test_cancelKbdNavigationWitMouse(data) {
++            launcher.autohideEnabled = data.autohide;
              launcher.openForKeyboardNavigation();
              waitForRendering(launcher);
++
              var launcherPanel = findChild(launcher, "launcherPanel");
              tryCompare(launcherPanel, "x", 0);
@@ -1176,15 +1253,22 @@
              keyClick(Qt.Key_Down); // Down to launcher item 0
              keyClick(Qt.Key_Down); // Down to launcher item 1
--            keyClick(Qt.Key_Right); // Into quicklist
++            if (data.withQuickList) {
++                keyClick(Qt.Key_Right); // Into quicklist
++                tryCompare(quickList, "visible", true)
++            }
              waitForRendering(launcher)
--            tryCompare(quickList, "visible", true)
--
--            mouseClick(root, root.width / 2, units.gu(2));
--
--            tryCompare(launcher, "state", "");
--            tryCompare(launcherPanel, "highlightIndex", -2);
++
++            mouseClick(root);
++
++            if (data.autohide) {
++                tryCompare(launcher, "state", "");
++            } else {
++                tryCompare(launcher, "state", "visible");
++            }
++
++            assertFocusOnIndex(-2);
+         }
+     }
+ }
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2016-02-19 15:10:33 +0000
 +++ tests/qmltests/tst_Shell.qml	2016-02-19 15:10:34 +0000
@@ -223,6 +223,19 @@
+                     }
+                 }
++                Row {
++                    anchors { left: parent.left; right: parent.right }
++                    CheckBox {
++                        id: autohideLauncherCheckbox
++                        onCheckedChanged:  {
++                            GSettingsController.setAutohideLauncher(checked)
++                        }
++                    }
++                    Label {
++                        text: "Autohide launcher"
++                    }
++                }
++
                  Label { text: "Applications"; font.bold: true }
                  Button {
@@ -921,6 +934,7 @@
          function dragLauncherIntoView() {
              var launcher = findChild(shell, "launcher");
              var launcherPanel = findChild(launcher, "launcherPanel");
++            waitForRendering(launcher);
              verify(launcherPanel.x = - launcherPanel.width);
              var touchStartX = 2;
@@ -1678,7 +1692,7 @@
              var x = 0;
              var y = shell.height * .5
              mouseMove(shell, x, y)
--            while (x <= spreadFlickable.width) {
++            while (x <= shell.width) {
                  x+=10;
                  mouseMove(shell, x, y)
                  wait(0); // spin the loop so bindings get evaluated
@@ -1752,25 +1766,38 @@
              keyRelease(Qt.Key_Alt);
+         }
--        function test_focusAppFromLauncherExitsSpread() {
++        function test_focusAppFromLauncherExitsSpread_data() {
++            return [
++                {tag: "autohide launcher", launcherLocked: false },
++                {tag: "locked launcher", launcherLocked: true }
++            ]
++        }
++
++        function test_focusAppFromLauncherExitsSpread(data) {
              loadDesktopShellWithApps()
--
++            var launcher = findChild(shell, "launcher");
              var desktopSpread = findChild(shell, "spread");
--            var launcher = findChild(shell, "launcher");
              var bfb = findChild(launcher, "buttonShowDashHome");
++            GSettingsController.setAutohideLauncher(!data.launcherLocked);
++            waitForRendering(shell);
++
              keyPress(Qt.Key_Alt)
              keyClick(Qt.Key_Tab);
              tryCompare(desktopSpread, "state", "altTab")
--            revealLauncherByEdgePushWithMouse();
--            tryCompare(launcher, "x", 0);
--            mouseMove(bfb, bfb.width / 2, bfb.height / 2)
--            waitForRendering(shell)
++            if (!data.launcherLocked) {
++                revealLauncherByEdgePushWithMouse();
++                tryCompare(launcher, "x", 0);
++                mouseMove(bfb, bfb.width / 2, bfb.height / 2)
++                waitForRendering(shell)
++            }
              mouseClick(bfb, bfb.width / 2, bfb.height / 2)
--            tryCompare(launcher, "state", "")
++            if (!data.launcherLocked) {
++                tryCompare(launcher, "state", "")
++            }
              tryCompare(desktopSpread, "state", "")
              tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash")
@@ -1998,16 +2025,24 @@
+             }
+         }
--        function test_superTabToCycleLauncher() {
++        function test_superTabToCycleLauncher_data() {
++            return [
++                {tag: "autohide launcher", launcherLocked: false},
++                {tag: "locked launcher", launcherLocked: true}
++            ]
++        }
++
++        function test_superTabToCycleLauncher(data) {
              loadShell("desktop");
              shell.usageScenario = "desktop";
++            GSettingsController.setAutohideLauncher(!data.launcherLocked);
              waitForRendering(shell);
              var launcher = findChild(shell, "launcher");
              var launcherPanel = findChild(launcher, "launcherPanel");
              var firstAppInLauncher = LauncherModel.get(0).appId;
--            compare(launcher.state, "");
++            compare(launcher.state, data.launcherLocked ? "visible": "");
              compare(launcherPanel.highlightIndex, -2);
              compare(ApplicationManager.focusedApplicationId, "unity8-dash");
@@ -2019,7 +2054,7 @@
              keyClick(Qt.Key_Tab);
              tryCompare(launcherPanel, "highlightIndex", 0);
              keyRelease(Qt.Key_Super_L, Qt.MetaModifier);
--            tryCompare(launcher, "state", "");
++            tryCompare(launcher, "state", data.launcherLocked ? "visible" : "");
              tryCompare(launcherPanel, "highlightIndex", -2);
              tryCompare(ApplicationManager, "focusedApplicationId", firstAppInLauncher);
@@ -2029,7 +2064,7 @@
              tryCompare(launcher, "state", "visible");
              tryCompare(launcherPanel, "highlightIndex", -1);
              keyRelease(Qt.Key_Super_L, Qt.MetaModifier);
--            tryCompare(launcher, "state", "");
++            tryCompare(launcher, "state", data.launcherLocked ? "visible" : "");
              tryCompare(launcherPanel, "highlightIndex", -2);
              tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash");
+         }
@@ -2078,6 +2113,49 @@
              tryCompare(launcher, "focus", true)
+         }
++        function test_lockedOutLauncherAddsMarginsToMaximized() {
++            loadShell("desktop");
++            shell.usageScenario = "desktop";
++            waitForRendering(shell);
++            var appContainer = findChild(shell, "appContainer");
++            var launcher = findChild(shell, "launcher");
++
++            var app = ApplicationManager.startApplication("music-app");
++            waitUntilAppWindowIsFullyLoaded(app);
++            var appDelegate = findChild(appContainer, "appDelegate_music-app");
++            appDelegate.maximize();
++            tryCompare(appDelegate, "visuallyMaximized", true);
++            waitForRendering(shell);
++
++            GSettingsController.setAutohideLauncher(true);
++            waitForRendering(shell)
++            var hiddenSize = appDelegate.width;
++
++            GSettingsController.setAutohideLauncher(false);
++            waitForRendering(shell)
++            var shownSize = appDelegate.width;
++
++            compare(shownSize + launcher.panelWidth, hiddenSize);
++        }
++
++        function test_fullscreenAppHidesLockedOutLauncher() {
++            loadShell("desktop");
++            shell.usageScenario = "desktop";
++
++            var launcher = findChild(shell, "launcher");
++            var launcherPanel = findChild(launcher, "launcherPanel");
++
++            GSettingsController.setAutohideLauncher(false);
++            waitForRendering(shell)
++
++            tryCompare(launcher, "lockedVisible", true);
++
++            var cameraApp = ApplicationManager.startApplication("camera-app");
++            waitUntilAppWindowIsFullyLoaded(cameraApp);
++
++            tryCompare(launcher, "lockedVisible", false);
++        }
++
          function test_inputEventsOnEdgesEndUpInAppSurface_data() {
              return [
                  { tag: "phone", repeaterName: "spreadRepeater" },