Merge lp:~tiagosh/phone-app/phone-app-1181362 into lp:phone-app

[Bill Filler]

Prevent the search field from being partially covered by the view header

Prevent the search field from being partially covered by the view header

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:657
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~tiagosh/phone-app/phone-app-1181362/+merge/165921/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/phone-app-ci/118/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/phone-app-raring-amd64-ci/42/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-raring-armhf-ci/91
        deb: http://jenkins.qa.ubuntu.com/job/phone-app-raring-armhf-ci/91/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/phone-app-raring-i386-ci/91/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phone-app-ci/118/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:657
http://jenkins.qa.ubuntu.com/job/phone-app-ci/122/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-raring-amd64-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-raring-armhf-ci/95
        deb: http://jenkins.qa.ubuntu.com/job/phone-app-raring-armhf-ci/95/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-raring-i386-ci/95

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phone-app-ci/122/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

tested, works

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/phone-app-autolanding/57/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/phone-app-raring-amd64-autolanding/23/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phone-app-raring-armhf-autolanding/49/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phone-app-raring-i386-autolanding/49/console

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/phone-app/phone-app-1181362]

658. By Tiago Salem Herrmann on 2013-05-29

* Allow toggling favorite even when not editing a contact (LP: #1185064).
* Added rotation support;
* Added i18n support;

659. By Tiago Salem Herrmann on 2013-05-29

update changelog

660. By Tiago Salem Herrmann on 2013-05-29

remove old code

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:660
http://jenkins.qa.ubuntu.com/job/phone-app-ci/130/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-raring-amd64-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-raring-armhf-ci/103
        deb: http://jenkins.qa.ubuntu.com/job/phone-app-raring-armhf-ci/103/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-raring-i386-ci/103

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phone-app-ci/130/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

approved

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-29 03:13:19 +0000
+++ debian/changelog	2013-05-29 18:13:25 +0000
@@ -1,8 +1,10 @@
-phone-app (0.59.12-0ubuntu2) UNRELEASED; urgency=low
+phone-app (0.59.12-0ubuntu2) raring; urgency=low
 
   * Allow toggling favorite even when not editing a contact (LP: #1185064).
+  * Prevent the search field from being partially covered by the 
+  view header (LP: 1181362).
 
- -- Tiago Salem Herrmann <[e-mail]>  Wed, 29 May 2013 00:10:30 -0300
+ -- Tiago Salem Herrmann <[e-mail]>  Wed, 29 May 2013 15:06:30 -0300
 
 phone-app (0.59.12-0ubuntu1) raring; urgency=low
 

=== modified file 'src/qml/PanelCommunications/CommunicationsPanel.qml'
--- src/qml/PanelCommunications/CommunicationsPanel.qml	2013-05-24 13:08:32 +0000
+++ src/qml/PanelCommunications/CommunicationsPanel.qml	2013-05-29 18:13:25 +0000
@@ -26,6 +26,16 @@
     id: messageList
     objectName: "communicationPanel"
     title: i18n.tr("Conversations")
+    onActiveChanged: {
+        // workaround to scroll ListView to the top. 
+        // We currently place the search bar inside the
+        // ListView header, and it is not taken into
+        // account when calculating the header offset.
+        // Ref.: https://bugs.launchpad.net/phone-app/+bug/1181362
+        if (active) {
+            communicationsList.contentY = -communicationsList.headerItem.height-header.height
+        }
+    }
     tools: ToolbarActions {
         Action {
             iconSource: Qt.resolvedUrl("../assets/compose.png")

=== modified file 'src/qml/PanelContacts/ContactsPanel.qml'
--- src/qml/PanelContacts/ContactsPanel.qml	2013-05-24 13:08:32 +0000
+++ src/qml/PanelContacts/ContactsPanel.qml	2013-05-29 18:13:25 +0000
@@ -26,6 +26,17 @@
 LocalWidgets.PhonePage {
     id: contactsPanel
     title: i18n.tr("Contacts")
+    onActiveChanged: {
+        // workaround to scroll ListView to the top.
+        // We currently place the search bar inside the
+        // ListView header, and it is not taken into
+        // account when calculating the header offset.
+        // Ref.: https://bugs.launchpad.net/phone-app/+bug/1181362
+        if (active) {
+            contactsList.contentY = -contactsList.headerItem.height-
+header.height
+        }
+    }
 
     tools: ToolbarActions {
         Action {