Unity 8

Merge lp:~bfiller/unity8/add-new-telephony into lp:unity8

  1. add-new-telephony
  2. Merge into trunk
Proposed by Bill Filler
Status: Merged
Approved by: Ricardo Salveti
Approved revision: 250
Merged at revision: 267
Proposed branch: lp:~bfiller/unity8/add-new-telephony
Merge into: lp:unity8
Diff against target: 115 lines (+49/-13)
2 files modified
Dash/Apps/FrequentlyUsedAppsModel.qml (+40/-10)
plugins/Unity/Launcher/backend/launcherbackend.cpp (+9/-3)
To merge this branch: bzr merge lp:~bfiller/unity8/add-new-telephony
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Ricardo Salveti (community) Approve
Michael Frey (community) Approve
Michael Zanetti Pending
Review via email: mp+182184@code.launchpad.net

This proposal supersedes a proposal from 2013-08-26.

Commit message

add new telephony apps (dialer, messaging, contacts) to launcher and Home scope.

Description of the change

add new telephony apps (dialer, messaging, contacts) to launcher and Home scope.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:249
http://jenkins.qa.ubuntu.com/job/unity8-ci/777/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2625/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/252
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1333/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/778
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/778/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/777
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2631/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/254
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/254/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/227
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/230

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) wrote : Posted in a previous version of this proposal

Note that on the phone, the launcher starts up unfolded at the bottom, folding the top-most icons (Also inverting the order of the icons compared to the Desktop). The reason for this is to have important items easily reachable with the thumb while putting the others far away to the top.

review: Needs Fixing
Revision history for this message
Bill Filler (bfiller) wrote :

New MR does not change the order of the launcher icons, per above comment.

IMPORTANT: do not approve this MR until ping from bfiller to ensure that dialer-app and messaging-app and associated services have landed into saucy. This has not occurred yet

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:250
http://jenkins.qa.ubuntu.com/job/unity8-ci/780/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2633
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/260
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1339
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/781
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/781/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/780
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2639
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2639/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2229
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/262
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/262/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/234
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/237

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

review: Approve (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

This can land after the apps have been added to the seed in this MR:
https://code.launchpad.net/~bfiller/ubuntu-seeds/ubuntu-touch.saucy-add-dialer-messaging/+merge/182487

Revision history for this message
Michael Frey (mfrey) wrote :

approve

review: Approve
Revision history for this message
Ricardo Salveti (rsalveti) wrote :

Tested, works awesome.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Dash/Apps/FrequentlyUsedAppsModel.qml'
2--- Dash/Apps/FrequentlyUsedAppsModel.qml 2013-08-20 22:29:48 +0000
3+++ Dash/Apps/FrequentlyUsedAppsModel.qml 2013-08-26 18:53:39 +0000
4@@ -18,6 +18,36 @@
5
6 ListModel {
7 ListElement {
8+ uri: "application:///usr/share/applications/dialer-app.desktop"
9+ icon: "../../graphics/applicationIcons/phone-app.png"
10+ category: 0
11+ mimetype: "application/x-desktop"
12+ title: "Dialer"
13+ comment: ""
14+ dndUri: "file:///usr/share/applications/dialer-app.desktop"
15+ metadata: ""
16+ }
17+ ListElement {
18+ uri: "application:///usr/share/applications/messaging-app.desktop"
19+ icon: "../../graphics/applicationIcons/messages-app.png"
20+ category: 0
21+ mimetype: "application/x-desktop"
22+ title: "Messaging"
23+ comment: ""
24+ dndUri: "file:///usr/share/applications/messaging-app.desktop"
25+ metadata: ""
26+ }
27+ ListElement {
28+ uri: "application:///usr/share/applications/address-book-app.desktop"
29+ icon: "../../graphics/applicationIcons/contacts-app.png"
30+ category: 0
31+ mimetype: "application/x-desktop"
32+ title: "Contacts"
33+ comment: ""
34+ dndUri: "file:///usr/share/applications/address-book-app.desktop"
35+ metadata: ""
36+ }
37+ ListElement {
38 uri: "application:///usr/share/applications/camera-app.desktop"
39 icon: "../../graphics/applicationIcons/camera.png"
40 category: 0
41@@ -28,16 +58,6 @@
42 metadata: ""
43 }
44 ListElement {
45- uri: "application:///usr/share/applications/phone-app.desktop"
46- icon: "../../graphics/applicationIcons/phone-app.png"
47- category: 0
48- mimetype: "application/x-desktop"
49- title: "Phone"
50- comment: ""
51- dndUri: "file:///usr/share/applications/phone-app.desktop"
52- metadata: ""
53- }
54- ListElement {
55 uri: "application:///usr/share/applications/gallery-app.desktop"
56 icon: "../../graphics/applicationIcons/gallery.png"
57 category: 0
58@@ -77,4 +97,14 @@
59 dndUri: "file:///usr/share/applications/gmail-webapp.desktop"
60 metadata: ""
61 }
62+ ListElement {
63+ uri: "application:///usr/share/applications/ubuntu-system-settings.desktop"
64+ icon: "../../graphics/applicationIcons/system-settings.png"
65+ category: 0
66+ mimetype: "application/x-desktop"
67+ title: "System Settings"
68+ comment: ""
69+ dndUri: "file:///usr/share/applications/ubuntu-system-settings.desktop"
70+ metadata: ""
71+ }
72 }
73
74=== added file 'graphics/applicationIcons/contacts-app@18.png'
75Binary files graphics/applicationIcons/contacts-app@18.png 1970-01-01 00:00:00 +0000 and graphics/applicationIcons/contacts-app@18.png 2013-08-26 18:53:39 +0000 differ
76=== added file 'graphics/applicationIcons/messages-app@18.png'
77Binary files graphics/applicationIcons/messages-app@18.png 1970-01-01 00:00:00 +0000 and graphics/applicationIcons/messages-app@18.png 2013-08-26 18:53:39 +0000 differ
78=== added file 'graphics/applicationIcons/system-settings@18.png'
79Binary files graphics/applicationIcons/system-settings@18.png 1970-01-01 00:00:00 +0000 and graphics/applicationIcons/system-settings@18.png 2013-08-26 18:53:39 +0000 differ
80=== modified file 'plugins/Unity/Launcher/backend/launcherbackend.cpp'
81--- plugins/Unity/Launcher/backend/launcherbackend.cpp 2013-08-16 11:41:27 +0000
82+++ plugins/Unity/Launcher/backend/launcherbackend.cpp 2013-08-26 18:53:39 +0000
83@@ -28,7 +28,9 @@
84 // TODO: load default pinned ones from default config, instead of hardcoding here...
85
86 m_storedApps <<
87- QLatin1String("phone-app.desktop") <<
88+ QLatin1String("dialer-app.desktop") <<
89+ QLatin1String("messaging-app.desktop") <<
90+ QLatin1String("address-book-app.desktop") <<
91 QLatin1String("camera-app.desktop") <<
92 QLatin1String("gallery-app.desktop") <<
93 QLatin1String("facebook-webapp.desktop") <<
94@@ -40,7 +42,9 @@
95 QLatin1String("calendar-app.desktop");
96
97 // TODO: get stuff from desktop files instead this hardcoded map
98- m_displayNameMap.insert("phone-app.desktop", "Phone");
99+ m_displayNameMap.insert("dialer-app.desktop", "Dialer");
100+ m_displayNameMap.insert("messaging-app.desktop", "Messaging");
101+ m_displayNameMap.insert("address-book-app.desktop", "Contacts");
102 m_displayNameMap.insert("camera-app.desktop", "Camera");
103 m_displayNameMap.insert("gallery-app.desktop", "Gallery");
104 m_displayNameMap.insert("facebook-webapp.desktop", "Facebook");
105@@ -52,7 +56,9 @@
106 m_displayNameMap.insert("calendar-app.desktop", "Calendar");
107
108 // TODO: get stuff from desktop files instead this hardcoded map
109- m_iconMap.insert("phone-app.desktop", "phone-app");
110+ m_iconMap.insert("dialer-app.desktop", "phone-app");
111+ m_iconMap.insert("messaging-app.desktop", "messages-app");
112+ m_iconMap.insert("address-book-app.desktop", "contacts-app");
113 m_iconMap.insert("camera-app.desktop", "camera");
114 m_iconMap.insert("gallery-app.desktop", "gallery");
115 m_iconMap.insert("facebook-webapp.desktop", "facebook");

Subscribers

People subscribed via source and target branches