1
=== modified file 'src/qml/MMS/Previewer.qml'
2
--- src/qml/MMS/Previewer.qml	2016-04-21 04:15:31 +0000
3
+++ src/qml/MMS/Previewer.qml	2016-07-25 17:14:08 +0000
4
@@ -63,7 +63,7 @@
5
63
                    iconName: "back"
63
                    iconName: "back"
6
64
                    shortcut: "Esc"
64
                    shortcut: "Esc"
7
65
                    onTriggered: {
65
                    onTriggered: {
9
66
                        mainStack.removePage(previewerPage)
66
                        mainStack.removePages(previewerPage)
10
67
                    }
67
                    }
11
68
                }
68
                }
12
69
            ]
69
            ]
13
@@ -133,11 +133,11 @@
14
133
133
15
134
            onPeerSelected: {
134
            onPeerSelected: {
16
135
                picker.curTransfer = peer.request();
135
                picker.curTransfer = peer.request();
18
136
                mainStack.removePage(picker);
136
                mainStack.removePages(picker);
19
137
                if (picker.curTransfer.state === ContentTransfer.InProgress)
137
                if (picker.curTransfer.state === ContentTransfer.InProgress)
20
138
                    picker.__exportItems(picker.url);
138
                    picker.__exportItems(picker.url);
21
139
            }
139
            }
23
140
            onCancelPressed: mainStack.removePage(picker);
140
            onCancelPressed: mainStack.removePages(picker);
24
141
        }
141
        }
25
142
142
26
143
        Connections {
143
        Connections {
27
144
144
28
=== modified file 'src/qml/MMS/PreviewerMultipleContacts.qml'
29
--- src/qml/MMS/PreviewerMultipleContacts.qml	2016-04-21 04:15:31 +0000
30
+++ src/qml/MMS/PreviewerMultipleContacts.qml	2016-07-25 17:14:08 +0000
31
@@ -58,7 +58,7 @@
32
58
            property var contact: thumbnail.vcard.contacts[index]
58
            property var contact: thumbnail.vcard.contacts[index]
33
59
59
34
60
            onClicked: {
60
            onClicked: {
36
61
                mainStack.addComponentToCurrentColumnSync(root, sigleContatPreviewer, {'contact': contact})
61
                mainStack.addPageToCurrentColumn(root, sigleContatPreviewer, {'contact': contact})
37
62
            }
62
            }
38
63
        }
63
        }
39
64
    }
64
    }
40
65
65
41
=== modified file 'src/qml/MMSDelegate.qml'
42
--- src/qml/MMSDelegate.qml	2016-06-28 20:21:42 +0000
43
+++ src/qml/MMSDelegate.qml	2016-07-25 17:14:08 +0000
44
@@ -45,7 +45,7 @@
45
45
            var properties = {}
45
            var properties = {}
46
46
            properties["attachment"] = attachment.item.attachment
46
            properties["attachment"] = attachment.item.attachment
47
47
            properties["thumbnail"] = attachment.item
47
            properties["thumbnail"] = attachment.item
49
48
            mainStack.addFileToCurrentColumnSync(messages.basePage, Qt.resolvedUrl(attachment.item.previewer), properties)
48
            mainStack.addPageToCurrentColumn(messages.basePage, Qt.resolvedUrl(attachment.item.previewer), properties)
50
49
        }
49
        }
51
50
    }
50
    }
52
51
51
53
52
52
54
=== modified file 'src/qml/MainPage.qml'
55
--- src/qml/MainPage.qml	2016-07-08 13:46:54 +0000
56
+++ src/qml/MainPage.qml	2016-07-25 17:14:08 +0000
57
@@ -96,8 +96,7 @@
58
96
                    text: i18n.tr("Settings")
96
                    text: i18n.tr("Settings")
59
97
                    iconName: "settings"
97
                    iconName: "settings"
60
98
                    onTriggered: {
98
                    onTriggered: {
63
99
                        emptyStack(false)
99
                        pageStack.addPageToNextColumn(mainPage, Qt.resolvedUrl("SettingsPage.qml"))
62
100
                        pageStack.addFileToNextColumnSync(mainPage, Qt.resolvedUrl("SettingsPage.qml"))
64
101
                    }
100
                    }
65
102
                },
101
                },
66
103
                Action {
102
                Action {
67
@@ -282,8 +281,7 @@
68
282
                    if (displayedEvent != null) {
281
                    if (displayedEvent != null) {
69
283
                        properties["scrollToEventId"] = displayedEvent.eventId
282
                        properties["scrollToEventId"] = displayedEvent.eventId
70
284
                    }
283
                    }
73
285
                    emptyStack(false)
284
                    mainStack.addPageToNextColumn(mainPage, messagesWithBottomEdge, properties)
72
286
                    mainStack.addComponentToNextColumnSync(mainPage, messagesWithBottomEdge, properties)
74
287
285
75
288
                    // mark this item as current
286
                    // mark this item as current
76
289
                    threadList.currentIndex = index
287
                    threadList.currentIndex = index
77
290
288
78
=== modified file 'src/qml/Messages.qml'
79
--- src/qml/Messages.qml	2016-07-13 20:42:55 +0000
80
+++ src/qml/Messages.qml	2016-07-25 17:14:08 +0000
81
@@ -676,7 +676,7 @@
82
676
                    iconName: "contact"
676
                    iconName: "contact"
83
677
                    onTriggered: {
677
                    onTriggered: {
84
678
                        Qt.inputMethod.hide()
678
                        Qt.inputMethod.hide()
86
679
                        mainStack.addFileToCurrentColumnSync(messages.basePage,  Qt.resolvedUrl("NewRecipientPage.qml"), {"multiRecipient": multiRecipient})
679
                        mainStack.addPageToCurrentColumn(messages.basePage,  Qt.resolvedUrl("NewRecipientPage.qml"), {"multiRecipient": multiRecipient})
87
680
                    }
680
                    }
88
681
                }
681
                }
89
682
682
90
683
683
91
=== modified file 'src/qml/MessagingContactEditorPage.qml'
92
--- src/qml/MessagingContactEditorPage.qml	2016-06-20 12:22:19 +0000
93
+++ src/qml/MessagingContactEditorPage.qml	2016-07-25 17:14:08 +0000
94
@@ -55,7 +55,7 @@
95
55
    onContactSaved: {
55
    onContactSaved: {
96
56
        if (root.contactListPage) {
56
        if (root.contactListPage) {
97
57
            if (root.contactListPage.phoneToAdd !== "") {
57
            if (root.contactListPage.phoneToAdd !== "") {
99
58
                mainStack.removePage(root.contactListPage)
58
                mainStack.removePages(root.contactListPage)
100
59
            } else {
59
            } else {
101
60
                root.contactListPage.moveListToContact(contact)
60
                root.contactListPage.moveListToContact(contact)
102
61
                root.contactListPage.phoneToAdd = ""
61
                root.contactListPage.phoneToAdd = ""
103
62
62
104
=== modified file 'src/qml/MessagingContactViewPage.qml'
105
--- src/qml/MessagingContactViewPage.qml	2016-02-01 20:10:42 +0000
106
+++ src/qml/MessagingContactViewPage.qml	2016-07-25 17:14:08 +0000
107
@@ -35,6 +35,7 @@
108
35
    readonly property string contactEditorPageURL: Qt.resolvedUrl("MessagingContactEditorPage.qml")
35
    readonly property string contactEditorPageURL: Qt.resolvedUrl("MessagingContactEditorPage.qml")
109
36
    property string addPhoneToContact: ""
36
    property string addPhoneToContact: ""
110
37
    property var contactListPage: null
37
    property var contactListPage: null
111
38
    model: null
112
38
39
113
39
    function addPhoneToContactImpl(contact, phoneNumber)
40
    function addPhoneToContactImpl(contact, phoneNumber)
114
40
    {
41
    {
115
@@ -62,7 +63,7 @@
116
62
            iconName: "share"
63
            iconName: "share"
117
63
            visible: root.editable
64
            visible: root.editable
118
64
            onTriggered: {
65
            onTriggered: {
120
65
                pageStack.addComponentToCurrentColumnSync(root, contactShareComponent,
66
                pageStack.addPageToCurrentColumn(root, contactShareComponent,
121
66
                               { contactModel: root.model,
67
                               { contactModel: root.model,
122
67
                                 contacts: [root.contact] })
68
                                 contacts: [root.contact] })
123
68
            }
69
            }
124
@@ -73,7 +74,7 @@
125
73
            iconName: "edit"
74
            iconName: "edit"
126
74
            visible: root.editable
75
            visible: root.editable
127
75
            onTriggered: {
76
            onTriggered: {
129
76
                pageStack.addFileToCurrentColumnSync(root, contactEditorPageURL,
77
                pageStack.addPageToCurrentColumn(root, contactEditorPageURL,
130
77
                               { model: root.model,
78
                               { model: root.model,
131
78
                                 contact: root.contact,
79
                                 contact: root.contact,
132
79
                                 contactListPage: root.contactListPage })
80
                                 contactListPage: root.contactListPage })
133
@@ -123,9 +124,9 @@
134
123
        } else {
124
        } else {
135
124
            Qt.openUrlExternally(("%1:%2").arg(action).arg(detail.value(0)))
125
            Qt.openUrlExternally(("%1:%2").arg(action).arg(detail.value(0)))
136
125
        }
126
        }
138
126
        pageStack.removePage(root)
127
        pageStack.removePages(root)
139
127
    }
128
    }
141
128
    onContactRemoved: pageStack.removePage(root)
129
    onContactRemoved: pageStack.removePages(root)
142
129
    onContactFetched: {
130
    onContactFetched: {
143
130
        root.contact = contact
131
        root.contact = contact
144
131
        if (root.active && root.addPhoneToContact != "") {
132
        if (root.active && root.addPhoneToContact != "") {
145
132
133
146
=== removed file 'src/qml/MessagingPageLayout.qml'
147
--- src/qml/MessagingPageLayout.qml	2016-05-02 18:35:28 +0000
148
+++ src/qml/MessagingPageLayout.qml	1970-01-01 00:00:00 +0000
149
@@ -1,85 +0,0 @@
150
1
/*
151
2
 * Copyright 2016 Canonical Ltd.
152
3
 *
153
4
 * This file is part of messaging-app.
154
5
 *
155
6
 * messaging-app is free software; you can redistribute it and/or modify
156
7
 * it under the terms of the GNU General Public License as published by
157
8
 * the Free Software Foundation; version 3.
158
9
 *
159
10
 * messaging-app is distributed in the hope that it will be useful,
160
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
161
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
162
13
 * GNU General Public License for more details.
163
14
 *
164
15
 * You should have received a copy of the GNU General Public License
165
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
166
17
 */
167
18
168
19
import QtQuick 2.0
169
20
import Ubuntu.Components 1.3
170
21
171
22
AdaptivePageLayout {
172
23
    id: layout
173
24
    property var _pagesToRemove: []
174
25
175
26
    layouts: PageColumnsLayout {
176
27
        when: mainStack.width >= units.gu(90)
177
28
        PageColumn {
178
29
            maximumWidth: units.gu(50)
179
30
            minimumWidth: units.gu(40)
180
31
            preferredWidth: units.gu(40)
181
32
        }
182
33
        PageColumn {
183
34
            fillWidth: true
184
35
        }
185
36
    }
186
37
187
38
188
39
    function deleteInstances() {
189
40
        for (var i in _pagesToRemove) {
190
41
            if (_pagesToRemove[i].destroy) {
191
42
                _pagesToRemove[i].destroy()
192
43
            }
193
44
        }
194
45
        _pagesToRemove = []
195
46
    }
196
47
197
48
    function removePage(page) {
198
49
        // check if this page was allocated dynamically and then remove it
199
50
        for (var i in _pagesToRemove) {
200
51
            if (_pagesToRemove[i] == page) {
201
52
                _pagesToRemove[i].destroy()
202
53
                _pagesToRemove.splice(i, 1)
203
54
                break
204
55
            }
205
56
        }
206
57
        removePages(page)
207
58
    }
208
59
209
60
    function addFileToNextColumnSync(parentObject, resolvedUrl, properties) {
210
61
        addComponentToNextColumnSync(parentObject, Qt.createComponent(resolvedUrl), properties)
211
62
    }
212
63
213
64
    function addFileToCurrentColumnSync(parentObject, resolvedUrl, properties) {
214
65
        addComponentToCurrentColumnSync(parentObject, Qt.createComponent(resolvedUrl), properties)
215
66
    }
216
67
217
68
    function addComponentToNextColumnSync(parentObject, component, properties) {
218
69
        if (typeof(properties) === 'undefined') {
219
70
            properties = {}
220
71
        }
221
72
        var page = component.createObject(parentObject, properties)
222
73
        layout.addPageToNextColumn(parentObject, page)
223
74
        _pagesToRemove.push(page)
224
75
    }
225
76
226
77
    function addComponentToCurrentColumnSync(parentObject, component, properties) {
227
78
        if (typeof(properties) === 'undefined') {
228
79
            properties = {}
229
80
        }
230
81
        var page = component.createObject(parentObject, properties)
231
82
        layout.addPageToCurrentColumn(parentObject, page)
232
83
        _pagesToRemove.push(page)
233
84
    }
234
85
}
235
86
0
236
=== modified file 'src/qml/NewRecipientPage.qml'
237
--- src/qml/NewRecipientPage.qml	2016-06-21 00:56:52 +0000
238
+++ src/qml/NewRecipientPage.qml	2016-07-25 17:14:08 +0000
239
@@ -43,7 +43,7 @@
240
43
    {
43
    {
241
44
        multiRecipient.addRecipient(phoneNumber)
44
        multiRecipient.addRecipient(phoneNumber)
242
45
        multiRecipient.forceActiveFocus()
45
        multiRecipient.forceActiveFocus()
244
46
        mainStack.removePage(newRecipientPage)
46
        mainStack.removePages(newRecipientPage)
245
47
    }
47
    }
246
48
48
247
49
    header: PageHeader {
49
    header: PageHeader {
248
@@ -64,7 +64,7 @@
249
64
                    text: i18n.tr("Back")
64
                    text: i18n.tr("Back")
250
65
                    iconName: "back"
65
                    iconName: "back"
251
66
                    onTriggered: {
66
                    onTriggered: {
253
67
                        mainStack.removePage(newRecipientPage)
67
                        mainStack.removePages(newRecipientPage)
254
68
                        newRecipientPage.destroy()
68
                        newRecipientPage.destroy()
255
69
                    }
69
                    }
256
70
                }
70
                }
257
@@ -190,7 +190,7 @@
258
190
190
259
191
        onAddNewContactClicked: {
191
        onAddNewContactClicked: {
260
192
            var newContact = ContactsJS.createEmptyContact(newRecipientPage.phoneToAdd, newRecipientPage)
192
            var newContact = ContactsJS.createEmptyContact(newRecipientPage.phoneToAdd, newRecipientPage)
262
193
            mainStack.addFileToCurrentColumnSync(newRecipientPage,
193
            mainStack.addPageToCurrentColumn(newRecipientPage,
263
194
                                             Qt.resolvedUrl("MessagingContactEditorPage.qml"),
194
                                             Qt.resolvedUrl("MessagingContactEditorPage.qml"),
264
195
                                             { model: contactList.listModel,
195
                                             { model: contactList.listModel,
265
196
                                               contact: newContact,
196
                                               contact: newContact,
266
197
197
267
=== modified file 'src/qml/messaging-app.qml'
268
--- src/qml/messaging-app.qml	2016-07-21 19:47:04 +0000
269
+++ src/qml/messaging-app.qml	2016-07-25 17:14:08 +0000
270
@@ -105,8 +105,13 @@
271
105
    }
105
    }
272
106
106
273
107
    function showContactDetails(currentPage, contact, contactListPage, contactsModel) {
107
    function showContactDetails(currentPage, contact, contactListPage, contactsModel) {
276
108
        var initialProperties =  { "contactListPage": contactListPage,
108
        var initialProperties = {}
277
109
                                   "model": contactsModel}
109
        if (contactListPage) {
278
110
            initialProperties["contactListPage"] = contactListPage
279
111
        }
280
112
        if (contactsModel) {
281
113
            initialProperties["model"] = contactsModel
282
114
        }
283
110
115
284
111
        if (typeof(contact) == 'string') {
116
        if (typeof(contact) == 'string') {
285
112
            initialProperties['contactId'] = contact
117
            initialProperties['contactId'] = contact
286
@@ -114,34 +119,30 @@
287
114
            initialProperties['contact'] = contact
119
            initialProperties['contact'] = contact
288
115
        }
120
        }
289
116
121
291
117
        mainStack.addFileToCurrentColumnSync(currentPage,
122
        mainStack.addPageToCurrentColumn(currentPage,
292
118
                                         Qt.resolvedUrl("MessagingContactViewPage.qml"),
123
                                         Qt.resolvedUrl("MessagingContactViewPage.qml"),
293
119
                                         initialProperties)
124
                                         initialProperties)
294
120
    }
125
    }
295
121
126
296
122
    function addNewContact(currentPage, phoneNumber, contactListPage) {
297
123
        mainStack.addFileToCurrentColumnSync(currentPage,
298
124
                                         Qt.resolvedUrl("MessagingContactEditorPage.qml"),
299
125
                                         { "contactId": contactId,
300
126
                                           "addPhoneToContact": phoneNumber,
301
127
                                           "contactListPage": contactListPage })
302
128
    }
303
129
304
130
    function addPhoneToContact(currentPage, contact, phoneNumber, contactListPage, contactsModel) {
127
    function addPhoneToContact(currentPage, contact, phoneNumber, contactListPage, contactsModel) {
305
131
        if (contact === "") {
128
        if (contact === "") {
307
132
            mainStack.addFileToCurrentColumnSync(currentPage,
129
            mainStack.addPageToCurrentColumn(currentPage,
308
133
                                             Qt.resolvedUrl("NewRecipientPage.qml"),
130
                                             Qt.resolvedUrl("NewRecipientPage.qml"),
309
134
                                             { "phoneToAdd": phoneNumber })
131
                                             { "phoneToAdd": phoneNumber })
310
135
        } else {
132
        } else {
314
136
            var initialProperties = { "addPhoneToContact": phoneNumber,
133
            var initialProperties = { "addPhoneToContact": phoneNumber }
315
137
                                      "contactListPage": contactListPage,
134
            if (contactListPage) {
316
138
                                      "model": contactsModel }
135
                initialProperties["contactListPage"] = contactListPage
317
136
            }
318
137
            if (contactsModel) {
319
138
                initialProperties["model"] = contactsModel
320
139
            }
321
139
            if (typeof(contact) == 'string') {
140
            if (typeof(contact) == 'string') {
322
140
                initialProperties['contactId'] = contact
141
                initialProperties['contactId'] = contact
323
141
            } else {
142
            } else {
324
142
                initialProperties['contact'] = contact
143
                initialProperties['contact'] = contact
325
143
            }
144
            }
327
144
            mainStack.addFileToCurrentColumnSync(currentPage,
145
            mainStack.addPageToCurrentColumn(currentPage,
328
145
                                             Qt.resolvedUrl("MessagingContactViewPage.qml"),
146
                                             Qt.resolvedUrl("MessagingContactViewPage.qml"),
329
146
                                             initialProperties)
147
                                             initialProperties)
330
147
        }
148
        }
331
@@ -288,8 +289,7 @@
332
288
    function emptyStack(showEmpty) {
289
    function emptyStack(showEmpty) {
333
289
        if (typeof showEmpty === 'undefined') { showEmpty = true; }
290
        if (typeof showEmpty === 'undefined') { showEmpty = true; }
334
290
        mainView.emptyStackRequested()
291
        mainView.emptyStackRequested()
337
291
        mainStack.removePage(mainPage)
292
        mainStack.removePages(mainPage)
336
292
        layout.deleteInstances()
338
293
        if (showEmpty) {
293
        if (showEmpty) {
339
294
            showEmptyState()
294
            showEmptyState()
340
295
        }
295
        }
341
@@ -298,7 +298,7 @@
342
298
298
343
299
    function showEmptyState() {
299
    function showEmptyState() {
344
300
        if (mainStack.columns > 1 && !application.findMessagingChild("emptyStatePage")) {
300
        if (mainStack.columns > 1 && !application.findMessagingChild("emptyStatePage")) {
346
301
            layout.addComponentToNextColumnSync(mainPage, emptyStatePageComponent)
301
            layout.addPageToNextColumn(mainPage, emptyStatePageComponent)
347
302
        }
302
        }
348
303
    }
303
    }
349
304
304
350
@@ -351,7 +351,7 @@
351
351
        emptyStack(false)
351
        emptyStack(false)
352
352
        // FIXME: AdaptivePageLayout takes a really long time to create pages,
352
        // FIXME: AdaptivePageLayout takes a really long time to create pages,
353
353
        // so we create manually and push that
353
        // so we create manually and push that
355
354
        mainStack.addComponentToNextColumnSync(mainPage, messagesWithBottomEdge, properties)
354
        mainStack.addPageToNextColumn(mainPage, messagesWithBottomEdge, properties)
356
355
    }
355
    }
357
356
356
358
357
    InputInfo {
357
    InputInfo {
359
@@ -409,30 +409,17 @@
360
409
            id: emptyStatePage
409
            id: emptyStatePage
361
410
            objectName: "emptyStatePage"
410
            objectName: "emptyStatePage"
362
411
411
363
412
            function deleteMe() {
364
413
                emptyStatePage.destroy(1)
365
414
                emptyStatePage.objectName = ""
366
415
            }
367
416
368
417
            Connections {
412
            Connections {
369
418
                target: layout
413
                target: layout
370
419
                onColumnsChanged: {
414
                onColumnsChanged: {
371
420
                    if (layout.columns == 1) {
415
                    if (layout.columns == 1) {
372
421
                        emptyStatePage.deleteMe()
373
422
                        if (!application.findMessagingChild("fakeItem")) {
416
                        if (!application.findMessagingChild("fakeItem")) {
375
423
                            layout.removePage(mainPage)
417
                            emptyStack()
376
424
                        }
418
                        }
377
425
                    }
419
                    }
378
426
                }
420
                }
379
427
            }
421
            }
380
428
422
381
429
            Connections {
382
430
                target: mainView
383
431
                onEmptyStackRequested: {
384
432
                    emptyStatePage.deleteMe()
385
433
                }
386
434
            }
387
435
388
436
            EmptyState {
423
            EmptyState {
389
437
                labelVisible: false
424
                labelVisible: false
390
438
            }
425
            }
391
@@ -455,9 +442,21 @@
392
455
        }
442
        }
393
456
    }
443
    }
394
457
444
396
458
    MessagingPageLayout {
445
    AdaptivePageLayout {
397
459
        id: layout
446
        id: layout
398
460
        anchors.fill: parent
447
        anchors.fill: parent
399
448
        layouts: PageColumnsLayout {
400
449
            when: mainStack.width >= units.gu(90)
401
450
            PageColumn {
402
451
                maximumWidth: units.gu(50)
403
452
                minimumWidth: units.gu(40)
404
453
                preferredWidth: units.gu(40)
405
454
            }
406
455
            PageColumn {
407
456
                fillWidth: true
408
457
            }
409
458
        }
410
459
        asynchronous: false
411
461
        primaryPage: MainPage {
460
        primaryPage: MainPage {
412
462
            id: mainPage
461
            id: mainPage
413
463
        }
462
        }
414
@@ -467,7 +466,6 @@
415
467
        onColumnsChanged: {
466
        onColumnsChanged: {
416
468
            // we only have things to do here in case no thread is selected
467
            // we only have things to do here in case no thread is selected
417
469
            if (layout.completed && layout.columns == 2 && !application.findMessagingChild("emptyStatePage") && !application.findMessagingChild("fakeItem")) {
468
            if (layout.completed && layout.columns == 2 && !application.findMessagingChild("emptyStatePage") && !application.findMessagingChild("fakeItem")) {
418
470
                layout.removePage(mainPage)
419
471
                emptyStack()
469
                emptyStack()
420
472
            }
470
            }
421
473
        }
471
        }
Status:	Merged
Approved by:	Tiago Salem Herrmann on 2016-07-29
Approved revision:	578
Merged at revision:	582
Proposed branch:	lp:~phablet-team/messaging-app/remove_apl_workarounds
Merge into:	lp:messaging-app
Prerequisite:	lp:~fboucault/messaging-app/async_bottom_edge
Diff against target:	421 lines (+51/-139) 10 files modified src/qml/MMS/Previewer.qml (+3/-3) src/qml/MMS/PreviewerMultipleContacts.qml (+1/-1) src/qml/MMSDelegate.qml (+1/-1) src/qml/MainPage.qml (+2/-4) src/qml/Messages.qml (+1/-1) src/qml/MessagingContactEditorPage.qml (+1/-1) src/qml/MessagingContactViewPage.qml (+5/-4) src/qml/MessagingPageLayout.qml (+0/-85) src/qml/NewRecipientPage.qml (+3/-3) src/qml/messaging-app.qml (+34/-36)
To merge this branch:	bzr merge lp:~phablet-team/messaging-app/remove_apl_workarounds
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Tiago Salem Herrmann (community)		2016-07-20	Approve on 2016-07-29
system-apps-ci-bot	continuous-integration	2016-07-20	Approve on 2016-07-25
Review via email: mp+300615@code.launchpad.net