lp://staging/~cimi/unity8/infographics-august-merge

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp://staging/unity8

PS Jenkins bot (community): Needs Fixing (continuous-integration) on 2014-09-03

Michał Sawicz: Needs Fixing on 2014-08-27

Diff: 1980 lines (+154/-1365)

31 files modified

build.sh (+1/-0)
debian/control (+1/-0)
plugins/LightDM/CMakeLists.txt (+0/-3)
plugins/LightDM/plugin.cpp (+0/-11)
qml/Greeter/GreeterContent.qml (+24/-28)
qml/Greeter/Infographics.qml (+18/-383)
run.sh (+0/-1)
tests/autopilot/unity8/__init__.py (+0/-5)
tests/autopilot/unity8/shell/tests/__init__.py (+0/-2)
tests/mocks/CMakeLists.txt (+1/-1)
tests/mocks/Infographics/CMakeLists.txt (+1/-0)
tests/mocks/Infographics/InfographicList.qml (+50/-0)
tests/mocks/Infographics/qmldir (+3/-0)
tests/mocks/LightDM/CMakeLists.txt (+1/-4)
tests/mocks/LightDM/UsersModel.cpp (+3/-0)
tests/mocks/LightDM/UsersModel.h (+2/-1)
tests/mocks/LightDM/UsersModelPrivate.h (+1/-0)
tests/mocks/LightDM/demo/CMakeLists.txt (+0/-2)
tests/mocks/LightDM/demo/UsersModelPrivate.cpp (+1/-1)
tests/mocks/LightDM/full/UsersModelPrivate.cpp (+19/-19)
tests/mocks/LightDM/single-passphrase/UsersModelPrivate.cpp (+1/-1)
tests/mocks/LightDM/single-pin/UsersModelPrivate.cpp (+1/-1)
tests/mocks/LightDM/single/UsersModelPrivate.cpp (+1/-1)
tests/mocks/libusermetrics/CMakeLists.txt (+0/-21)
tests/mocks/libusermetrics/ColorTheme.cpp (+0/-128)
tests/mocks/libusermetrics/ColorTheme.h (+0/-68)
tests/mocks/libusermetrics/UserMetrics.cpp (+0/-472)
tests/mocks/libusermetrics/UserMetrics.h (+0/-112)
tests/qmltests/CMakeLists.txt (+4/-4)
tests/qmltests/Greeter/tst_Infographics.qml (+0/-88)
tests/qmltests/Greeter/tst_SingleGreeter.qml (+21/-8)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1358331: usermetrics' circles overflow over passcode page

Medium

In Progress

Link a bug report

Related blueprints

860. By Andrea Cimitan on 2014-09-03

merged trunk

859. By Andrea Cimitan on 2014-08-19

Fusion with trunk

858. By Andrea Cimitan on 2014-07-23

Better test

857. By Andrea Cimitan on 2014-07-23

[ Michael Terry ]
* Allow running the dialer-app in emergency mode when the screen is
  locked.
[ Michał Sawicz ]
* Add missing nameOwner property to mock UnityMenuModel.
[ Albert Astals ]
* Fix name, There's nothing called pageHeader in this file
[ Nick Dedekind ]
* Added environment variable to upstart conf for mir trusted socket
* Removed indicator menu dismissal on menu activation (LP: #1337771)
[ Michał Sawicz ]
* Only generate .qmltypes files manually, no need to do it build-time.
  It didn't work when cross-compiling either, and required builders to
  have otherwise unnecessary environment.
* Fix CardCreator test. It got broken with a merge that got landed
  along side of it.
[ Ying-Chun Liu ]
* Add reboot/shutdown (LP: #1234062)
[ Albert Astals ]
* Make the departments test more stable
[ Mirco Müller ]
* Fixes gap at top of sim-unlock/fullscreen notification (point 1.),
  fixes blocking overlay if underlying UnityMenuModel vanishes from
  DBus (point 2.). The third bullet-point of the bug-report, lockup of
  shell-UI, could not be reproduced. (LP: #1308011)
[ Michael Terry ]
* Expose a new greeter DBus property, IsActive, which tells apps and
  indicators when the integrated-greeter screen is active. Useful for
  switching UI modes when the screen is locked.
* Allow the session to bring up the greeter/lockscreen over DBus. The
  emergency dialer will need this support in order to cancel bringing
  it up.
[ Michael Zanetti ]
* Fixes gap at top of sim-unlock/fullscreen notification (point 1.),
  fixes blocking overlay if underlying UnityMenuModel vanishes from
  DBus (point 2.). The third bullet-point of the bug-report, lockup of
  shell-UI, could not be reproduced. (LP: #1308011)
[ Michał Sawicz ]
* Activate all results in click scope by default. (LP: #1341262)
[ Mirco Müller ]
* Added support for utilization of the ComboButton SDK-element for
  snap-decision notifications with many actions.
[ Michal Hruby ]
* Fix FTBFS when using latest unity-api.
[ Michał Sawicz ]
* Refactor carousel item activation.
* Refactor ScopeItem into GenericScopeView.
* Add initial support for scope customizations.
* Make rating stars in PreviewReviewDisplay.qml non-interactive. (LP:
  #1337508)
[ Nick Dedekind ]
* Added active call hint A hint is displayed in the indicator panel
  when an call is active on the Telephony Serivce
[ Albert Astals ]
* We need to boostrap height also when we have 1 item ^_^ (LP:
  #1337408)
* Add initial support for scope customizations.
* CardCreator: Give a correct implicitHeight if we only have art The
  hasSubtitle change is really unrelated and not needed here, just
  sneaking it in to not create yet another review. (LP: #1330899)
* Fake Scopes Plugin: Register PreviewModelInterface
[ Michael Zanetti ]
* make the launcher's drag'n'drop indicator more prominent (LP:
  #1332042)
* make launcher items live having them non-live is not really required
  and reveals an issue in combination with UbuntuShape (LP: #1302761)
* Fade out launcher in place instead of moving it to the left on long
  left edge swipes. (LP: #1332096)
* update launcher icon glow as requested by design (LP: #1336725)
* update header in dash to use the new header from the SDK (LP:
  #1335491)
* fix testPreview with larger GRID_UNIT_PX values
* clip the corner of pinned icons in the launcher as per new design
* update launcher background according to latest design (LP: #1336314)
* Update Launcher's home button design according to new spec. (LP:
  #1329331)
[ CI bot ]
* make launcher items live having them non-live is not really required
  and reveals an issue in combination with UbuntuShape (LP: #1302761)

856. By Michał Sawicz on 2014-07-09

Drop newline.

855. By Michał Sawicz on 2014-07-09

Merge trunk.

854. By Andrea Cimitan on 2014-07-03

* debian/control:
  list qtdeclarative5-ubuntu-ui-toolkit-plugin-gles as an alternative
  choice, since provides are not versionned, should restore installability
  on amd64 and i386
[ Michał Sawicz ]
* Adapt to suru theme.
[ Michael Terry ]
* Fix path in launcher mock after moving our mock icons, to avoid a
  lot of "icon not found" warnings during qmluitests.
* Fix the testMultiGreeter qmluitest. Incoming method variables are
  apparently read-only in Qt5.3. (LP: #1332488)
[ CI bot ]
* Resync trunk
[ Michał Sawicz ]
* Adapt scope mock to new api and quiet unused variable warnings.
* Fix dynamic overlay height. (LP: #1334879)
* Don't center items in CardVerticalJournal, kind of beats the
  purpose... Also don't bind unnecessarily.
[ Ying-Chun Liu ]
* Fix LP:1330957 Fix some failed test cases. (LP: #1330957)
[ Albert Astals ]
* Don't seem to need this waitForRendering And makes test fail in 5.3
[ Alberto Aguirre ]
* Update Powerd plugin and Shell.qml to accommodate changes in the
  display power state notification.
[ Ying-Chun Liu ]
* Add logout support. Reviewed by: Daniel d'Andrada (LP: #1302213)
[ Michał Sawicz ]
* Make so that fixedArtShapeSize actually fixes artShapeSize.
[ Albert Astals ]
* Add VerticalJournal integration to Dash/scopes/QML (LP: #1326467)
* Make so that fixedArtShapeSize actually fixes artShapeSize.
[ Mirco Müller ]
* Added the frontend-part of sound-hint support for notifications with
  updated QML-tests.
* New rebuild forced
[ Albert Astals ]
* Departments support (LP: #1320847)
[ Pawel Stolowski ]
* Extend the hack for click scope categories with the upcoming 'store'
  category: single-tap on results from the 'store' category should
  activate them, instead of requesting a preview. (LP: #1326292)
[ Albert Astals ]
* Drop the " Preview" suffix from Preview title As requested in
  https://bugs.launchpad.net/unity8/+bug/1316671 (LP: #1316671)

853. By Andrea Cimitan on 2014-07-03

Use SDK CrossFadeImage

852. By Andrea Cimitan on 2014-06-30

Removed Item container inside infographics and updated cmakelists

851. By Andrea Cimitan on 2014-06-30

Add sourcesize