Merge lp://staging/~mterry/unity-api/warn-on-xapp into lp://staging/unity-api
Status: | Work in progress |
---|---|
Proposed branch: | lp://staging/~mterry/unity-api/warn-on-xapp |
Merge into: | lp://staging/unity-api |
Diff against target: |
262 lines (+71/-3) 13 files modified
debian/changelog (+7/-0) include/unity/shell/application/ApplicationManagerInterface.h (+19/-0) include/unity/shell/application/CMakeLists.txt (+1/-1) include/unity/shell/launcher/CMakeLists.txt (+1/-1) include/unity/shell/launcher/LauncherItemInterface.h (+7/-0) include/unity/shell/launcher/LauncherModelInterface.h (+3/-1) test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.cpp (+7/-0) test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.h (+2/-0) test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.cpp (+15/-0) test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.h (+4/-0) test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherModel.cpp (+2/-0) test/qmltest/unity/shell/application/tst_Application.qml (+1/-0) test/qmltest/unity/shell/launcher/tst_Launcher.qml (+2/-0) |
To merge this branch: | bzr merge lp://staging/~mterry/unity-api/warn-on-xapp |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Unity8 CI Bot | continuous-integration | Approve | |
Gerry Boland (community) | Needs Fixing | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+277922@code.staging.launchpad.net |
Commit message
Add support for isTouchApp property on LauncherItems and support for approving an application before it starts.
Description of the change
This is part of a larger effort to allow warning users before a legacy app is started [1].
==
isTouchApp on LauncherItems may be used by unity8 to render the launcher icons differently (though it isn't used now... waiting on design feedback).
This is a distinct setting from the isTouchApp property on ApplicationInfo since LauncherItems represent a potentially-running app, while ApplicationInfos represent a running app.
I considered making a more generic property. Something like "type" which could be "touch", "legacy", or something new and weird in the future. ("gnome" or "android" or something)
However, I felt that a launcher item backend was not necessarily the best place to condense the various information sources into one single answer (what if the .desktop file somehow indicates touch and android support?).
Plus, I felt that the interface should be as dumb as possible, which helps .desktop file backends simply pass the info they see through.
(And it matches the existing ApplicationInfo property)
==
The approveApplicat
==
[1] https:/
https:/
https:/
Unmerged revisions
- 200. By Michael Terry
-
Fix changelog/version
- 199. By Michael Terry
-
Fix documentation nit from review
- 198. By Michael Terry
-
Merge from trunk
- 197. By Michael Terry
-
Merge from trunk
- 196. By Michael Terry
-
Add new ApplicationManager methods for approving an interface
- 195. By Michael Terry
-
Add isTouchApp to LauncherItemInt
erface
PASSED: Continuous integration, rev:195 jenkins. qa.ubuntu. com/job/ unity-api- ci/361/ jenkins. qa.ubuntu. com/job/ unity-api- vivid-amd64- ci/49 jenkins. qa.ubuntu. com/job/ unity-api- vivid-armhf- ci/50 jenkins. qa.ubuntu. com/job/ unity-api- vivid-armhf- ci/50/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ unity-api- vivid-i386- ci/49 jenkins. qa.ubuntu. com/job/ unity-api- wily-amd64- ci/60 jenkins. qa.ubuntu. com/job/ unity-api- wily-armhf- ci/60 jenkins. qa.ubuntu. com/job/ unity-api- wily-armhf- ci/60/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ unity-api- wily-i386- ci/60
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- api-ci/ 361/rebuild
http://