Merge lp:~vthompson/ubuntu-weather-app/fix-1490040 into lp:ubuntu-weather-app

[Victor Thompson]

* Show the bottom loading animation (LoadingIndicator) on the LocationsPage.

* Show the bottom loading animation (LoadingIndicator) on the LocationsPage.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:126
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/251/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/221
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/251

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/251/rebuild

review: Approve (continuous-integration)

[lp:~vthompson/ubuntu-weather-app/fix-1490040]

127. By Victor Thompson on 2015-10-18

Merge of trunk and resolve conflicts

[Andrew Hayzen (ahayzen)]

LGTM :-)

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:127
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/275/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/275

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/275/rebuild

review: Approve (continuous-integration)

=== modified file 'app/ui/LocationsPage.qml'
--- app/ui/LocationsPage.qml	2015-09-10 23:43:49 +0000
+++ app/ui/LocationsPage.qml	2015-10-18 15:18:24 +0000
@@ -258,6 +258,10 @@
         }
     }
 
+    LoadingIndicator {
+        id: loadingIndicator
+    }
+
     Loader {
         active: locationsList === null || locationsList.length === 0
         anchors {
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-10-16 00:12:57 +0000
+++ debian/changelog	2015-10-18 15:18:24 +0000
@@ -28,6 +28,7 @@
   * Make sure the text elides on the LocationsPage and the AddLocationPage. (LP: #1469460)
   * Make the first column of the day delegate extra info wider to accommodate other
     languages.
+  * Show the bottom loading animation (LoadingIndicator) on the LocationsPage. (LP: #1490040)
 
   [ Andrew Hayzen ]
   * Add mocked locations for autopilot and add a test using the data