Merge lp:~unity-api-team/unity8/rtm-gps-overactive into lp:unity8/rtm-14.09

[dobey]

GPS only goes active when the Dash is in the foreground

GPS only goes active when the Dash is in the foreground

[Ricardo Salveti (rsalveti)]

current build number: 263
device name: krillin
channel: ubuntu-touch/ubuntu-rtm/14.09-proposed
last update: 2015-04-06 10:12:37
version version: 263
version ubuntu: 20150403.1
version device: 20150327-f7072d0
version custom: 20150216-561-29-186

Tested and works as expected.

review: Approve

=== modified file 'qml/Dash/Dash.qml'
--- qml/Dash/Dash.qml	2015-01-13 19:06:35 +0000
+++ qml/Dash/Dash.qml	2015-04-06 14:13:45 +0000
@@ -179,7 +179,7 @@
         Binding {
             target: scopesList.scope
             property: "isActive"
-            value: bottomEdgeController.progress === 1
+            value: bottomEdgeController.progress === 1 && Qt.application.active
         }
 
         Connections {

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2015-02-23 11:34:59 +0000
+++ qml/Dash/GenericScopeView.qml	2015-04-06 14:13:45 +0000
@@ -105,7 +105,7 @@
     Binding {
         target: scope
         property: "isActive"
-        value: isCurrent && !subPageLoader.open && (Powerd.status === Powerd.On)
+        value: isCurrent && !subPageLoader.open && Qt.application.active
     }
 
     SortFilterProxyModel {