Merge lp:~ahayzen/music-app/fix-1514143-workaround into lp:music-app

[Andrew Hayzen]

* Workaround for bug 1514143 by locking the header when searching

* Workaround for bug 1514143 by locking the header when searching

The issue comes from using a flickable with a movable header, so for now the header is made static when in searching mode.

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:939
https://core-apps-jenkins.ubuntu.com/job/music-app-ci/6/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/139/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/music-app-ci/6/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

This looks good! Just one small inline comment.

review: Needs Fixing

[lp:~ahayzen/music-app/fix-1514143-workaround]

940. By Andrew Hayzen on 2015-11-17

* Add code comment for fixed header height

941. By Andrew Hayzen on 2015-11-17

* Merge of trunk

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:941
https://core-apps-jenkins.ubuntu.com/job/music-app-ci/13/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/146/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/music-app-ci/13/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

LGTM!

review: Approve

=== modified file 'app/components/HeadState/SearchHeadState.qml'
--- app/components/HeadState/SearchHeadState.qml	2015-08-12 23:36:44 +0000
+++ app/components/HeadState/SearchHeadState.qml	2015-11-17 02:00:33 +0000
@@ -56,6 +56,11 @@
                 if (state === "default") {
                     searchField.text = ""
                 }
+
+                // FIXME: Workaround for pad.lv/1514143 (keyboard show/hide on view moving)
+                // by locking the header and forcing a topMargin of page to the header height
+                headerState.head.locked = state === headerState.name;
+                thisPage.anchors.topMargin = state === headerState.name ? units.gu(6.125) : 0  // FIXME: 6.125 is header.height
             }
 
             onVisibleChanged: {
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-11-17 01:51:14 +0000
+++ debian/changelog	2015-11-17 02:00:33 +0000
@@ -15,6 +15,7 @@
 
   [ Andrew Hayzen ]
   * Switch to using the new uc1.3 listitems within the SDK
+  * Workaround for bug 1514143 by locking the header when searching (LP: #1514143)
 
  -- Bartosz Kosiorek <[e-mail]>  Tue, 08 Sep 2015 10:08:49 +0200