Merge lp:~unity-team/unity8/rtm-20150121 into lp:unity8/rtm-14.09

[kevin gunn]

merge bug fixes from vivid, for bugs 1409003, 1410830, 1413065, 1398427

rtm bug fix cherrypicks for
power dialogs on resume bug #1409003, #1410830
don't refocus the dialer-app bug #1413065
support for earpiece media buttons bug #1398427

[Michael Zanetti (mzanetti)]

looking good

review: Approve

[Michael Zanetti (mzanetti)]

Note! For bug #1398427 (earpiece) the required telephony framework changes have not landed in RTM yet!

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-20 11:18:22 +0000
+++ debian/changelog	2015-01-22 03:13:04 +0000
@@ -1,3 +1,16 @@
+unity8 (8.02+15.04.20150121~rtm-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Michael Terry ]
+  * Don't show any power dialogs while the screen is off. (LP: #1409003, 
+    #1410830)
+  * Don't refocus the dialer-app when a call is started by the user. (LP: 
+    #1413065)
+
+  [ Michael Zanetti ]
+  * Add support for earpiece media buttons (LP: #1398427)
+
+ -- Kevin Gunn <[e-mail]>  Wed, 21 Jan 2015 20:48:55 -0600
+
 unity8 (8.02+15.04.20150120~rtm-0ubuntu1) 14.09; urgency=medium
 
   [ Albert Astals ]

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2015-01-14 09:09:08 +0000
+++ qml/Shell.qml	2015-01-22 03:13:04 +0000
@@ -157,8 +157,20 @@
 
     WindowKeysFilter {
         Keys.onPressed: {
-            if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {
-                dialogs.onPowerKeyPressed();
+            // Nokia earpieces give TogglePlayPause, while the iPhone's earpiece gives Play
+            if (event.key == Qt.Key_MediaTogglePlayPause || event.key == Qt.Key_MediaPlay) {
+                event.accepted = callManager.handleMediaKey(false);
+            } else if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {
+                // FIXME: We only consider power key presses if the screen is
+                // on because of bugs 1410830/1409003.  The theory is that when
+                // those bugs are encountered, there is a >2s delay between the
+                // power press event and the power release event, which causes
+                // the shutdown dialog to appear on resume.  So to avoid that
+                // symptom while we investigate the root cause, we simply won't
+                // initiate any dialogs when the screen is off.
+                if (Powerd.status === Powerd.On) {
+                    dialogs.onPowerKeyPressed();
+                }
                 event.accepted = true;
             } else {
                 volumeKeyFilter.onKeyPressed(event.key);
@@ -610,7 +622,7 @@
         target: callManager
 
         onHasCallsChanged: {
-            if (shell.locked && callManager.hasCalls) {
+            if (shell.locked && callManager.hasCalls && greeter.lockedApp !== "dialer-app") {
                 // We just received an incoming call while locked.  The
                 // indicator will have already launched dialer-app for us, but
                 // there is a race between "hasCalls" changing and the dialer