Unity 8

Merge lp:~josharenson/unity8/input-name-filter-proxy into lp:unity8

input-name-filter-proxy
Merge into trunk

Proposed by Josh Arenson on 2016-02-19

Status:

Merged

Approved by:

Michael Terry on 2016-03-03

Approved revision:

2206

Merged at revision:

2253

Proposed branch:

lp:~josharenson/unity8/input-name-filter-proxy

Merge into:

lp:unity8

Diff against target:

58 lines (+26/-1)

1 file modified

qml/OrientedShell.qml (+26/-1)

To merge this branch:

bzr merge lp:~josharenson/unity8/input-name-filter-proxy

Undecided

Invalid

Link a bug report

Reviewer	Review Type	Date Requested	Status
Michael Terry		2016-02-19	Approve on 2016-03-03
PS Jenkins bot	continuous-integration		Needs Fixing on 2016-02-25
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-02-25
Review via email: mp+286684@code.launchpad.net

Commit Message

Allow the shell to blacklist input devices and force the OSK shown.

This is a work arround to prevent autopilot tests from failing.

Description of the Change

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

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

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

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

* If you changed the UI, has there been a design review?
N/A

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-19:

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

review: Approve (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-19:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7381/rebuild

review: Needs Fixing (continuous-integration)

Michael Terry (mterry) wrote on 2016-02-22:

- onCountChanged -- what about if the count stays the same but the contents change? Is that possible / is there a different signal that could be used?

- blacklisted is an odd term for this. What about something more descriptive like forcedOskEnabled or autopilotMode or something.

- Would this mean there's no way to test u8 without OSK being present? That *might* be a path we'd want to test. Not necessarily a blocker for this, since I assume we don't have tests like that now. But is there a lighter touch we could employ, like an environment variable?

- Is the indenting on oskEnabled right? I'd expect the second line to be lined up after the colon.

review: Needs Information

Josh Arenson (josharenson) wrote on 2016-02-23:

> - onCountChanged -- what about if the count stays the same but the contents
> change? Is that possible / is there a different signal that could be used?
I'm wondering how a device could be added or removed without changing the count... I agree that it isn't a good signal to rely on and I'll explore alternatives.

>
> - blacklisted is an odd term for this. What about something more descriptive
> like forcedOskEnabled or autopilotMode or something.'
Noted.

>
> - Would this mean there's no way to test u8 without OSK being present? That
> *might* be a path we'd want to test. Not necessarily a blocker for this,
> since I assume we don't have tests like that now. But is there a lighter
> touch we could employ, like an environment variable?

The ultimate goal is to have ubuntu-keyboard provide "blacklist" (still working on a better name) information via gsettings. This means that osk will be forced only when specific tests call for it (as I envision it at least...). Thoughts?
>
> - Is the indenting on oskEnabled right? I'd expect the second line to be
> lined up after the colon.
Will fix.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-23:

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-23:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7400/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-24:

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

review: Approve (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-24:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7403/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-25:

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-25:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7423/rebuild

review: Needs Fixing (continuous-integration)

Josh Arenson (josharenson) wrote on 2016-02-26:

One more temporary solution.

Michael Terry (mterry) wrote on 2016-03-03:

Looks good code wise.

review: Approve

Michael Terry (mterry) wrote on 2016-03-03:

(looks like CI failed for unrelated reasons)

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:

Josh Arenson

Mohammad Rakibul Hasan

Unity Team

 === modified file 'qml/OrientedShell.qml'
 --- qml/OrientedShell.qml	2016-01-28 11:31:48 +0000
 +++ qml/OrientedShell.qml	2016-02-24 22:14:43 +0000
@@ -19,6 +19,7 @@
  import Unity.InputInfo 0.1
  import Unity.Session 0.1
  import Unity.Screens 0.1
++import Utils 0.1
  import GSettings 1.0
  import "Components"
  import "Rotation"
@@ -77,6 +78,8 @@
      InputDeviceModel {
          id: keyboardsModel
          deviceFilter: InputInfo.Keyboard
++        onDeviceAdded: forceOSKEnabled = autopilotDevicePresent();
++        onDeviceRemoved: forceOSKEnabled = autopilotDevicePresent();
+     }
      InputDeviceModel {
@@ -84,6 +87,27 @@
          deviceFilter: InputInfo.TouchScreen
+     }
++    /* FIXME: This exposes the NameRole as a work arround for lp:1542224.
++     * When QInputInfo exposes NameRole to QML, this should be removed.
++     */
++    property bool forceOSKEnabled: false
++    property var autopilotEmulatedDeviceNames: ["py-evdev-uinput"]
++    UnitySortFilterProxyModel {
++        id: autopilotDevices
++        model: keyboardsModel
++    }
++
++    function autopilotDevicePresent() {
++        for(var i = 0; i < autopilotDevices.count; i++) {
++            var device = autopilotDevices.get(i);
++            if (autopilotEmulatedDeviceNames.indexOf(device.name) != -1) {
++                console.warn("Forcing the OSK to be enabled as there is an autopilot eumlated device present.")
++                return true;
++            }
++        }
++        return false;
++    }
++
      Screens {
          id: screens
+     }
@@ -195,7 +219,8 @@
          //       have multiple keyboards around. For now we only enable one keyboard at a time
          //       thus hiding it here if there is a physical one around or if we have a second
          //       screen (the virtual touchpad & osk on the phone) attached.
--        oskEnabled: keyboardsModel.count === 0 && screens.count === 1
++        oskEnabled: (keyboardsModel.count === 0 && screens.count === 1) ||
++                    forceOSKEnabled
          // TODO: Factor in the connected input devices (eg: physical keyboard, mouse, touchscreen),
          //       what's the output device (eg: big TV, desktop monitor, phone display), etc.