Merge lp:~boiko/messaging-app/fix_header_after_sending_message into lp:messaging-app

[Gustavo Pichorim Boiko]

Do not display the "new conversation" item when in single panel as this makes
the header scroll.

Do not display the "new conversation" item when in single panel as this makes
the header scroll.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:524
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/971/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6712/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/480/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6723/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/971/rebuild

review: Needs Fixing (continuous-integration)

[lp:~boiko/messaging-app/fix_header_after_sending_message]

525. By Gustavo Pichorim Boiko on 2016-03-05

Do not scroll the list up when in single panel mode.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:525
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/972/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6713/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/481/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6724/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/972/rebuild

review: Needs Fixing (continuous-integration)

[lp:~boiko/messaging-app/fix_header_after_sending_message]

526. By Gustavo Pichorim Boiko on 2016-03-05

Fix a test flakiness

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:526
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/973/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6714/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/482/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6725/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/973/rebuild

review: Needs Fixing (continuous-integration)

[lp:~boiko/messaging-app/fix_header_after_sending_message]

527. By Gustavo Pichorim Boiko on 2016-03-05

Fix tryCompare usage

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:527
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/974/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6715/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/483/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6726/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/974/rebuild

review: Needs Fixing (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

looks good to me.
Thanks.

review: Approve

=== modified file 'src/qml/MainPage.qml'
--- src/qml/MainPage.qml	2016-02-12 13:15:42 +0000
+++ src/qml/MainPage.qml	2016-03-05 01:09:56 +0000
@@ -230,7 +230,8 @@
         header: ListItem.Standard {
             id: newItem
             height: mainView.bottomEdge.status === BottomEdge.Committed &&
-                    !mainView.bottomEdge.showingConversation ? units.gu(10) : 0
+                    !mainView.bottomEdge.showingConversation &&
+                    mainView.dualPanel ? units.gu(10) : 0
             text: i18n.tr("New message")
             iconName: "message-new"
             iconFrame: false
@@ -306,7 +307,7 @@
             target: threadList
             property: 'contentY'
             value: -threadList.headerItem.height
-            when: mainView.composingNewMessage
+            when: mainView.composingNewMessage && mainView.dualPanel
         }
     }
 
 
=== modified file 'tests/qml/tst_MMSDelegate.qml'
--- tests/qml/tst_MMSDelegate.qml	2015-12-01 19:24:14 +0000
+++ tests/qml/tst_MMSDelegate.qml	2016-03-05 01:09:56 +0000
@@ -99,7 +99,7 @@
             var image = findChild(mmsDelegate, "imageAttachment")
             verify(image != null)
             waitForRendering(image)
-            compare(image.source, "image://theme/image-missing")
+            tryCompare(image, "source", "image://theme/image-missing")
         }
     }