Merge lp:~jonas-drange/ubuntu-system-settings/lp1644268 into lp:ubuntu-system-settings

[Jonas G. Drange]

unhides hw keyboard page now that input sources are listed

[Ken VanDine (ken-vandine)]

looks good

review: Approve

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1749
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/278/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2191/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2194
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2021
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2021/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2021
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2021/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2021
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2021/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2021
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2021/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2021
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2021/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2021
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2021/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/2021/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2021
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2021/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2021
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2021/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/278/rebuild

review: Needs Fixing (continuous-integration)

[Jonas G. Drange (jonas-drange)]

approved syncing with trunk

review: Approve

=== modified file 'plugins/language/PageComponent.qml'
--- plugins/language/PageComponent.qml	2016-12-10 01:16:09 +0000
+++ plugins/language/PageComponent.qml	2017-01-02 14:48:45 +0000
@@ -169,9 +169,7 @@
                 progression: true
                 showDivider: false
                 onClicked: pageStack.push(Qt.resolvedUrl("PageHardwareKeyboard.qml"))
-                /* Hidden due to lp:1644268, i.e. no layout sources are
-                enumerated by the current code due to hard coded paths. */
-                visible: (externalKeyboardPresent && !isSnap) || showAllUI
+                visible: externalKeyboardPresent || showAllUI
             }
 
             ListItem.Divider {}