Unity 8

Merge lp:~mterry/unity8/no-home-when-locked into lp:unity8

no-home-when-locked
Merge into trunk

Proposed by Michael Terry on 2016-04-05

Status:

Merged

Approved by:

Daniel d'Andrada on 2016-04-26

Approved revision:

2329

Merged at revision:

2367

Proposed branch:

lp:~mterry/unity8/no-home-when-locked

Merge into:

lp:unity8

Diff against target:

40 lines (+18/-1)

2 files modified

qml/Shell.qml (+8/-1)
tests/qmltests/tst_Shell.qml (+10/-0)

To merge this branch:

bzr merge lp:~mterry/unity8/no-home-when-locked

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Daniel d'Andrada (community)		2016-04-05	Approve on 2016-04-26
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-04-06
Unity Team		2016-04-12	Pending
Review via email: mp+291050@code.launchpad.net

Commit Message

Ignore Home Key presses when the greeter is up.

This avoids pocket presses / dialing on devices like the arale.

Description of the Change

* Are there any related MPs required for this MP to build/function as expected? Please list.
No

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

* Did you make sure that your branch does not contain spurious tags?
Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
NA

* If you changed the UI, has there been a design review?
NA

lp:~mterry/unity8/no-home-when-locked updated on 2016-04-05

2329. By Michael Terry on 2016-04-05: Check coverPage, not greeter -- it animates closed

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-04-05:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/936/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-04-06:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/937/rebuild

review: Needs Fixing (continuous-integration)

Daniel d'Andrada (dandrader) wrote on 2016-04-06:

If the display is off, shouldn't that hardware home button be completely disabled? I mean, not even generate the event at driver level.

review: Needs Information

Michael Terry (mterry) wrote on 2016-04-06:

It can happen if the screen is first turned on. Say by a notification or whatnot. From the linked bug:

"If, for some reason, the display turns on (power button pressed inadvertently or battery notification for example) while the device is in a pocket, the button is pressed, the greeter dismissed and the pocket starts tapping random keys until the device is completely locked."

Daniel d'Andrada (dandrader) wrote on 2016-04-06:

Code looks sensible. Didn't test though.

review: Approve (code)

Daniel d'Andrada (dandrader) wrote on 2016-04-06:

It would be nice if you could shorten that first line in the commit message. Unnecessarily verbose

Michael Terry (mterry) wrote on 2016-04-12:

I made the commit message shorter.

Daniel d'Andrada (dandrader) wrote on 2016-04-26:

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

* Did CI run pass? If not, please explain why.
Yes

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Michael Terry

Mohammad Rakibul Hasan

Unity Team

 === modified file 'qml/Shell.qml'
 --- qml/Shell.qml	2016-03-23 09:53:03 +0000
 +++ qml/Shell.qml	2016-04-05 21:18:46 +0000
@@ -179,7 +179,14 @@
+     }
      WindowInputMonitor {
--        onHomeKeyActivated: { launcher.fadeOut(); shell.showHome(); }
++        objectName: "windowInputMonitor"
++        onHomeKeyActivated: {
++            // Ignore when greeter is active, to avoid pocket presses
++            if (!greeter.active) {
++                launcher.fadeOut();
++                shell.showHome();
++            }
++        }
          onTouchBegun: { cursor.opacity = 0; }
          onTouchEnded: {
              // move the (hidden) cursor to the last known touch position
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2016-03-30 07:46:17 +0000
 +++ tests/qmltests/tst_Shell.qml	2016-04-05 21:18:46 +0000
@@ -1383,6 +1383,16 @@
              tryCompare(launcherPanel, "x", -launcherPanel.width);
+         }
++        function test_physicalHomeKeyPressDoesNothingWithActiveGreeter() {
++            loadShell("phone");
++
++            var windowInputMonitor = findInvisibleChild(shell, "windowInputMonitor");
++            var coverPage = findChild(shell, "coverPage");
++
++            windowInputMonitor.homeKeyActivated();
++            verify(coverPage.shown);
++        }
++
          function test_tabletLogin_data() {
              return [
                  {tag: "auth error", user: "auth-error", loggedIn: false, password: ""},