1
=== modified file 'data/com.canonical.Unity8.gschema.xml'
2
--- data/com.canonical.Unity8.gschema.xml	2016-12-10 14:06:18 +0000
3
+++ data/com.canonical.Unity8.gschema.xml	2017-02-28 13:38:13 +0000
4
@@ -58,6 +58,16 @@
5
58
      <summary>The uri to the app store</summary>
58
      <summary>The uri to the app store</summary>
6
59
      <description>This will be used whenever the user triggers an action to open the app store.</description>
59
      <description>This will be used whenever the user triggers an action to open the app store.</description>
7
60
    </key>
60
    </key>
8
61
    <key type="b" name="always-show-osk">
9
62
      <default>false</default>
10
63
      <summary>Force showing/hiding the OSK</summary>
11
64
      <description>Toggle the visibility of the On Screen Keyboard unconditionally</description>
12
65
    </key>
13
66
    <key type="b" name="osk-switch-visible">
14
67
      <default>false</default>
15
68
      <summary>Whether the OSK switch should be visible</summary>
16
69
      <description>Toggle the visibility of the OSK switch</description>
17
70
    </key>
18
61
  </schema>
71
  </schema>
19
62
72
20
63
  <schema path="/com/canonical/unity8/greeter/" id="com.canonical.Unity8.Greeter" gettext-domain="unity8">
73
  <schema path="/com/canonical/unity8/greeter/" id="com.canonical.Unity8.Greeter" gettext-domain="unity8">
21
64
74
22
=== modified file 'qml/Greeter/GreeterPrompt.qml'
23
--- qml/Greeter/GreeterPrompt.qml	2017-01-19 15:02:54 +0000
24
+++ qml/Greeter/GreeterPrompt.qml	2017-02-28 13:38:13 +0000
25
@@ -16,6 +16,7 @@
26
16
16
27
17
import QtQuick 2.4
17
import QtQuick 2.4
28
18
import Ubuntu.Components 1.3
18
import Ubuntu.Components 1.3
29
19
import GSettings 1.0
30
19
import "../Components"
20
import "../Components"
31
20
21
32
21
FocusScope {
22
FocusScope {
33
@@ -43,6 +44,11 @@
34
43
        }
44
        }
35
44
    }
45
    }
36
45
46
37
47
    GSettings {
38
48
        id: unity8Settings
39
49
        schema.id: "com.canonical.Unity8"
40
50
    }
41
51
42
46
    StyledItem {
52
    StyledItem {
43
47
        id: d
53
        id: d
44
48
54
45
@@ -154,14 +160,27 @@
46
154
        }
160
        }
47
155
161
48
156
        secondaryItem: [
162
        secondaryItem: [
57
157
            Icon {
163
            Row {
58
158
                id: capsIcon
164
                id: extraIcons
59
159
                name: "keyboard-caps-enabled"
165
                spacing: passwordInput.frameSpacing
60
160
                height: units.gu(3)
166
                Icon {
61
161
                width: units.gu(3)
167
                    name: "keyboard-caps-enabled"
62
162
                color: d.textColor
168
                    height: units.gu(3)
63
163
                visible: root.isSecret && false // TODO: detect when caps lock is on
169
                    width: units.gu(3)
64
164
                readonly property real visibleWidth: visible ? width + passwordInput.frameSpacing : 0
170
                    color: d.textColor
65
171
                    visible: root.isSecret && false // TODO: detect when caps lock is on
66
172
                }
67
173
                Icon {
68
174
                    name: "input-keyboard-symbolic"
69
175
                    height: units.gu(3)
70
176
                    width: units.gu(3)
71
177
                    color: d.textColor
72
178
                    visible: !unity8Settings.alwaysShowOsk
73
179
                    MouseArea {
74
180
                        anchors.fill: parent
75
181
                        onClicked: unity8Settings.alwaysShowOsk = true
76
182
                    }
77
183
                }
78
165
            }
184
            }
79
166
        ]
185
        ]
80
167
186
81
@@ -199,7 +218,7 @@
82
199
                right: parent.right
218
                right: parent.right
83
200
                verticalCenter: parent.verticalCenter
219
                verticalCenter: parent.verticalCenter
84
201
                leftMargin: units.gu(1.5)
220
                leftMargin: units.gu(1.5)
86
202
                rightMargin: anchors.leftMargin + capsIcon.visibleWidth
221
                rightMargin: anchors.leftMargin + extraIcons.width
87
203
            }
222
            }
88
204
            text: root.text
223
            text: root.text
89
205
            visible: passwordInput.text == "" && !passwordInput.inputMethodComposing
224
            visible: passwordInput.text == "" && !passwordInput.inputMethodComposing
90
@@ -221,7 +240,7 @@
91
221
        anchors.left: parent.left
240
        anchors.left: parent.left
92
222
        anchors.right: parent.right
241
        anchors.right: parent.right
93
223
        anchors.leftMargin: passwordInput.frameSpacing * 2
242
        anchors.leftMargin: passwordInput.frameSpacing * 2
95
224
        anchors.rightMargin: passwordInput.frameSpacing * 2 + capsIcon.visibleWidth
243
        anchors.rightMargin: passwordInput.frameSpacing * 2 + extraIcons.width
96
225
        color: d.drawColor
244
        color: d.drawColor
97
226
        text: passwordInput.displayText
245
        text: passwordInput.displayText
98
227
        visible: root.isPrompt && !root.interactive
246
        visible: root.isPrompt && !root.interactive
99
228
247
100
=== modified file 'qml/OrientedShell.qml'
101
--- qml/OrientedShell.qml	2017-01-24 07:38:43 +0000
102
+++ qml/OrientedShell.qml	2017-02-28 13:38:13 +0000
103
@@ -197,6 +197,12 @@
104
197
        value: !shell.oskEnabled || shell.usageScenario == "desktop"
197
        value: !shell.oskEnabled || shell.usageScenario == "desktop"
105
198
    }
198
    }
106
199
199
107
200
    Binding {
108
201
        target: unity8Settings
109
202
        property: "oskSwitchVisible"
110
203
        value: shell.hasKeyboard
111
204
    }
112
205
113
200
    readonly property int supportedOrientations: shell.supportedOrientations
206
    readonly property int supportedOrientations: shell.supportedOrientations
114
201
        & (deviceConfiguration.supportedOrientations == deviceConfiguration.useNativeOrientation
207
        & (deviceConfiguration.supportedOrientations == deviceConfiguration.useNativeOrientation
115
202
                ? orientations.native_
208
                ? orientations.native_
116
@@ -268,12 +274,8 @@
117
268
        mode: applicationArguments.mode
274
        mode: applicationArguments.mode
118
269
        hasMouse: pointerInputDevices > 0
275
        hasMouse: pointerInputDevices > 0
119
270
        hasKeyboard: keyboardsModel.count > 0
276
        hasKeyboard: keyboardsModel.count > 0
126
271
        // TODO: Factor in if the current screen is a touch screen and if the user wants to
277
127
272
        //       have multiple keyboards around. For now we only enable one keyboard at a time
278
        oskEnabled: unity8Settings.alwaysShowOsk || !hasKeyboard || forceOSKEnabled
122
273
        //       thus hiding it here if there is a physical one around or if we have a second
123
274
        //       screen (the virtual touchpad & osk on the phone) attached.
124
275
        oskEnabled: (keyboardsModel.count === 0 && screens.count === 1) ||
125
276
                    forceOSKEnabled
128
277
279
129
278
        usageScenario: {
280
        usageScenario: {
130
279
            if (unity8Settings.usageMode === "Windowed") {
281
            if (unity8Settings.usageMode === "Windowed") {
131
280
282
132
=== modified file 'qml/Panel/Panel.qml'
133
--- qml/Panel/Panel.qml	2017-02-07 14:10:41 +0000
134
+++ qml/Panel/Panel.qml	2017-02-28 13:38:13 +0000
135
@@ -23,9 +23,6 @@
136
23
import Unity.ApplicationMenu 0.1
23
import Unity.ApplicationMenu 0.1
137
24
24
138
25
import QtQuick.Window 2.2
25
import QtQuick.Window 2.2
139
26
// for indicator-keyboard
140
27
import AccountsService 0.1
141
28
import Unity.InputInfo 0.1
142
29
26
143
30
import "../ApplicationMenus"
27
import "../ApplicationMenus"
144
31
import "../Components"
28
import "../Components"
145
@@ -47,6 +44,7 @@
146
47
    property bool fullscreenMode: false
44
    property bool fullscreenMode: false
147
48
    property real panelAreaShowProgress: 1.0
45
    property real panelAreaShowProgress: 1.0
148
49
    property bool greeterShown: false
46
    property bool greeterShown: false
149
47
    property bool hasKeyboard: false
150
50
48
151
51
    property string mode: "staged"
49
    property string mode: "staged"
152
52
50
153
@@ -337,12 +335,12 @@
154
337
                objectName: identifier+"-panelItem"
335
                objectName: identifier+"-panelItem"
155
338
336
156
339
                property int ownIndex: index
337
                property int ownIndex: index
159
340
                property bool overflow: parent.width - x > __indicators.overFlowWidth
338
                readonly property bool overflow: parent.width - x > __indicators.overFlowWidth
160
341
                property bool hidden: !expanded && (overflow || !indicatorVisible || hideSessionIndicator || hideKeyboardIndicator)
339
                readonly property bool hidden: !expanded && (overflow || !indicatorVisible || hideSessionIndicator || hideKeyboardIndicator)
161
342
                // HACK for indicator-session
340
                // HACK for indicator-session
162
343
                readonly property bool hideSessionIndicator: identifier == "indicator-session" && Math.min(Screen.width, Screen.height) <= units.gu(60)
341
                readonly property bool hideSessionIndicator: identifier == "indicator-session" && Math.min(Screen.width, Screen.height) <= units.gu(60)
163
344
                // HACK for indicator-keyboard
342
                // HACK for indicator-keyboard
165
345
                readonly property bool hideKeyboardIndicator: identifier == "indicator-keyboard" && (AccountsService.keymaps.length < 2 || keyboardsModel.count == 0)
343
                readonly property bool hideKeyboardIndicator: identifier == "indicator-keyboard" && !hasKeyboard
166
346
344
167
347
                height: parent.height
345
                height: parent.height
168
348
                expanded: indicators.expanded
346
                expanded: indicators.expanded
169
@@ -396,11 +394,6 @@
170
396
        }
394
        }
171
397
    }
395
    }
172
398
396
173
399
    InputDeviceModel {
174
400
        id: keyboardsModel
175
401
        deviceFilter: InputInfo.Keyboard
176
402
    }
177
403
178
404
    IndicatorsLight {
397
    IndicatorsLight {
179
405
        id: indicatorLights
398
        id: indicatorLights
180
406
    }
399
    }
181
407
400
182
=== modified file 'qml/Shell.qml'
183
--- qml/Shell.qml	2017-02-16 13:43:56 +0000
184
+++ qml/Shell.qml	2017-02-28 13:38:13 +0000
185
@@ -533,6 +533,7 @@
186
533
            fullscreenMode: (focusedSurfaceIsFullscreen && !LightDMService.greeter.active && launcher.progress == 0 && !stage.spreadShown)
533
            fullscreenMode: (focusedSurfaceIsFullscreen && !LightDMService.greeter.active && launcher.progress == 0 && !stage.spreadShown)
187
534
                            || greeter.hasLockedApp
534
                            || greeter.hasLockedApp
188
535
            greeterShown: greeter && greeter.shown
535
            greeterShown: greeter && greeter.shown
189
536
            hasKeyboard: shell.hasKeyboard
190
536
        }
537
        }
191
537
538
192
538
        Launcher {
539
        Launcher {
193
539
540
194
=== modified file 'tests/qmltests/Panel/tst_Panel.qml'
195
--- tests/qmltests/Panel/tst_Panel.qml	2017-01-24 07:44:18 +0000
196
+++ tests/qmltests/Panel/tst_Panel.qml	2017-02-28 13:38:13 +0000
197
@@ -272,6 +272,7 @@
198
272
        }
272
        }
199
273
273
200
274
        function cleanup() {
274
        function cleanup() {
201
275
            panel.hasKeyboard = false;
202
275
            panel.indicators.hide();
276
            panel.indicators.hide();
203
276
            panel.applicationMenus.hide();
277
            panel.applicationMenus.hide();
204
277
            waitForAllAnimationToComplete("initial");
278
            waitForAllAnimationToComplete("initial");
205
@@ -713,8 +714,8 @@
206
713
                { tag: "No keyboard, no keymap", keyboard: false, keymaps: [], hidden: true },
714
                { tag: "No keyboard, no keymap", keyboard: false, keymaps: [], hidden: true },
207
714
                { tag: "No keyboard, one keymap", keyboard: false, keymaps: ["us"], hidden: true },
715
                { tag: "No keyboard, one keymap", keyboard: false, keymaps: ["us"], hidden: true },
208
715
                { tag: "No keyboard, 2 keymaps", keyboard: false, keymaps: ["us", "cs"], hidden: true },
716
                { tag: "No keyboard, 2 keymaps", keyboard: false, keymaps: ["us", "cs"], hidden: true },
211
716
                { tag: "Keyboard, no keymap", keyboard: true, keymaps: [], hidden: true },
717
                { tag: "Keyboard, no keymap", keyboard: true, keymaps: [], hidden: false },
212
717
                { tag: "Keyboard, one keymap", keyboard: true, keymaps: ["us"], hidden: true },
718
                { tag: "Keyboard, one keymap", keyboard: true, keymaps: ["us"], hidden: false },
213
718
                { tag: "Keyboard, 2 keymaps", keyboard: true, keymaps: ["us", "cs"], hidden: false }
719
                { tag: "Keyboard, 2 keymaps", keyboard: true, keymaps: ["us", "cs"], hidden: false }
214
719
            ];
720
            ];
215
720
        }
721
        }
216
@@ -722,6 +723,7 @@
217
722
        function test_hidingKeyboardIndicator(data) {
723
        function test_hidingKeyboardIndicator(data) {
218
723
            var item = findChild(panel, "indicator-keyboard-panelItem");
724
            var item = findChild(panel, "indicator-keyboard-panelItem");
219
724
            AccountsService.keymaps = data.keymaps;
725
            AccountsService.keymaps = data.keymaps;
220
726
            panel.hasKeyboard = data.keyboard;
221
725
            if (data.keyboard) {
727
            if (data.keyboard) {
222
726
                MockInputDeviceBackend.addMockDevice("/indicator_kbd0", InputInfo.Keyboard);
728
                MockInputDeviceBackend.addMockDevice("/indicator_kbd0", InputInfo.Keyboard);
223
727
            } else {
729
            } else {
224
@@ -734,11 +736,12 @@
225
734
        function test_visibleIndicators_data() {
736
        function test_visibleIndicators_data() {
226
735
            return [
737
            return [
227
736
                { visible: [true, false, true, false, true, true, false, true] },
738
                { visible: [true, false, true, false, true, true, false, true] },
229
737
                { visible: [false, false, false, false, false, false, true, false] }
739
                { visible: [true, false, false, false, false, false, true, false] }
230
738
            ];
740
            ];
231
739
        }
741
        }
232
740
742
233
741
        function test_visibleIndicators(data) {
743
        function test_visibleIndicators(data) {
234
744
            panel.hasKeyboard = true;
235
742
            for (var i = 0; i < data.visible.length; i++) {
745
            for (var i = 0; i < data.visible.length; i++) {
236
743
                var visible = data.visible[i];
746
                var visible = data.visible[i];
237
744
                root.setIndicatorVisible(i, visible);
747
                root.setIndicatorVisible(i, visible);
Reviewer	Review Type	Date Requested	Status
Michał Sawicz		2017-03-02	Approve on 2017-03-06
Albert Astals Cid (community)		2017-02-15	Abstain on 2017-03-02
Unity8 CI Bot	continuous-integration		Approve on 2017-02-28
Michael Sheldon (community)			Approve on 2017-02-28
Review via email: mp+317349@code.launchpad.net
1	=== modified file 'data/com.canonical.Unity8.gschema.xml'
2	--- data/com.canonical.Unity8.gschema.xml 2016-12-10 14:06:18 +0000
3	+++ data/com.canonical.Unity8.gschema.xml 2017-02-28 13:38:13 +0000
4	@@ -58,6 +58,16 @@
5	58	<summary>The uri to the app store</summary>	58	<summary>The uri to the app store</summary>
6	59	<description>This will be used whenever the user triggers an action to open the app store.</description>	59	<description>This will be used whenever the user triggers an action to open the app store.</description>
7	60	</key>	60	</key>
8			61	<key type="b" name="always-show-osk">
9			62	<default>false</default>
10			63	<summary>Force showing/hiding the OSK</summary>
11			64	<description>Toggle the visibility of the On Screen Keyboard unconditionally</description>
12			65	</key>
13			66	<key type="b" name="osk-switch-visible">
14			67	<default>false</default>
15			68	<summary>Whether the OSK switch should be visible</summary>
16			69	<description>Toggle the visibility of the OSK switch</description>
17			70	</key>
18	61	</schema>	71	</schema>
19	62		72
20	63	<schema path="/com/canonical/unity8/greeter/" id="com.canonical.Unity8.Greeter" gettext-domain="unity8">	73	<schema path="/com/canonical/unity8/greeter/" id="com.canonical.Unity8.Greeter" gettext-domain="unity8">
21	64		74
22	=== modified file 'qml/Greeter/GreeterPrompt.qml'
23	--- qml/Greeter/GreeterPrompt.qml 2017-01-19 15:02:54 +0000
24	+++ qml/Greeter/GreeterPrompt.qml 2017-02-28 13:38:13 +0000
25	@@ -16,6 +16,7 @@
26	16		16
27	17	import QtQuick 2.4	17	import QtQuick 2.4
28	18	import Ubuntu.Components 1.3	18	import Ubuntu.Components 1.3
29			19	import GSettings 1.0
30	19	import "../Components"	20	import "../Components"
31	20		21
32	21	FocusScope {	22	FocusScope {
33	@@ -43,6 +44,11 @@
34	43	}	44	}
35	44	}	45	}
36	45		46
37			47	GSettings {
38			48	id: unity8Settings
39			49	schema.id: "com.canonical.Unity8"
40			50	}
41			51
42	46	StyledItem {	52	StyledItem {
43	47	id: d	53	id: d
44	48		54
45	@@ -154,14 +160,27 @@
46	154	}	160	}
47	155		161
48	156	secondaryItem: [	162	secondaryItem: [
57	157	Icon {	163	Row {
58	158	id: capsIcon	164	id: extraIcons
59	159	name: "keyboard-caps-enabled"	165	spacing: passwordInput.frameSpacing
60	160	height: units.gu(3)	166	Icon {
61	161	width: units.gu(3)	167	name: "keyboard-caps-enabled"
62	162	color: d.textColor	168	height: units.gu(3)
63	163	visible: root.isSecret && false // TODO: detect when caps lock is on	169	width: units.gu(3)
64	164	readonly property real visibleWidth: visible ? width + passwordInput.frameSpacing : 0	170	color: d.textColor
65			171	visible: root.isSecret && false // TODO: detect when caps lock is on
66			172	}
67			173	Icon {
68			174	name: "input-keyboard-symbolic"
69			175	height: units.gu(3)
70			176	width: units.gu(3)
71			177	color: d.textColor
72			178	visible: !unity8Settings.alwaysShowOsk
73			179	MouseArea {
74			180	anchors.fill: parent
75			181	onClicked: unity8Settings.alwaysShowOsk = true
76			182	}
77			183	}
78	165	}	184	}
79	166	]	185	]
80	167		186
81	@@ -199,7 +218,7 @@
82	199	right: parent.right	218	right: parent.right
83	200	verticalCenter: parent.verticalCenter	219	verticalCenter: parent.verticalCenter
84	201	leftMargin: units.gu(1.5)	220	leftMargin: units.gu(1.5)
86	202	rightMargin: anchors.leftMargin + capsIcon.visibleWidth	221	rightMargin: anchors.leftMargin + extraIcons.width
87	203	}	222	}
88	204	text: root.text	223	text: root.text
89	205	visible: passwordInput.text == "" && !passwordInput.inputMethodComposing	224	visible: passwordInput.text == "" && !passwordInput.inputMethodComposing
90	@@ -221,7 +240,7 @@
91	221	anchors.left: parent.left	240	anchors.left: parent.left
92	222	anchors.right: parent.right	241	anchors.right: parent.right
93	223	anchors.leftMargin: passwordInput.frameSpacing * 2	242	anchors.leftMargin: passwordInput.frameSpacing * 2
95	224	anchors.rightMargin: passwordInput.frameSpacing * 2 + capsIcon.visibleWidth	243	anchors.rightMargin: passwordInput.frameSpacing * 2 + extraIcons.width
96	225	color: d.drawColor	244	color: d.drawColor
97	226	text: passwordInput.displayText	245	text: passwordInput.displayText
98	227	visible: root.isPrompt && !root.interactive	246	visible: root.isPrompt && !root.interactive
99	228		247
100	=== modified file 'qml/OrientedShell.qml'
101	--- qml/OrientedShell.qml 2017-01-24 07:38:43 +0000
102	+++ qml/OrientedShell.qml 2017-02-28 13:38:13 +0000
103	@@ -197,6 +197,12 @@
104	197	value: !shell.oskEnabled \|\| shell.usageScenario == "desktop"	197	value: !shell.oskEnabled \|\| shell.usageScenario == "desktop"
105	198	}	198	}
106	199		199
107			200	Binding {
108			201	target: unity8Settings
109			202	property: "oskSwitchVisible"
110			203	value: shell.hasKeyboard
111			204	}
112			205
113	200	readonly property int supportedOrientations: shell.supportedOrientations	206	readonly property int supportedOrientations: shell.supportedOrientations
114	201	& (deviceConfiguration.supportedOrientations == deviceConfiguration.useNativeOrientation	207	& (deviceConfiguration.supportedOrientations == deviceConfiguration.useNativeOrientation
115	202	? orientations.native_	208	? orientations.native_
116	@@ -268,12 +274,8 @@
117	268	mode: applicationArguments.mode	274	mode: applicationArguments.mode
118	269	hasMouse: pointerInputDevices > 0	275	hasMouse: pointerInputDevices > 0
119	270	hasKeyboard: keyboardsModel.count > 0	276	hasKeyboard: keyboardsModel.count > 0
126	271	// TODO: Factor in if the current screen is a touch screen and if the user wants to	277
127	272	// have multiple keyboards around. For now we only enable one keyboard at a time	278	oskEnabled: unity8Settings.alwaysShowOsk \|\| !hasKeyboard \|\| forceOSKEnabled
122	273	// thus hiding it here if there is a physical one around or if we have a second
123	274	// screen (the virtual touchpad & osk on the phone) attached.
124	275	oskEnabled: (keyboardsModel.count === 0 && screens.count === 1) \|\|
125	276	forceOSKEnabled
128	277		279
129	278	usageScenario: {	280	usageScenario: {
130	279	if (unity8Settings.usageMode === "Windowed") {	281	if (unity8Settings.usageMode === "Windowed") {
131	280		282
132	=== modified file 'qml/Panel/Panel.qml'
133	--- qml/Panel/Panel.qml 2017-02-07 14:10:41 +0000
134	+++ qml/Panel/Panel.qml 2017-02-28 13:38:13 +0000
135	@@ -23,9 +23,6 @@
136	23	import Unity.ApplicationMenu 0.1	23	import Unity.ApplicationMenu 0.1
137	24		24
138	25	import QtQuick.Window 2.2	25	import QtQuick.Window 2.2
139	26	// for indicator-keyboard
140	27	import AccountsService 0.1
141	28	import Unity.InputInfo 0.1
142	29		26
143	30	import "../ApplicationMenus"	27	import "../ApplicationMenus"
144	31	import "../Components"	28	import "../Components"
145	@@ -47,6 +44,7 @@
146	47	property bool fullscreenMode: false	44	property bool fullscreenMode: false
147	48	property real panelAreaShowProgress: 1.0	45	property real panelAreaShowProgress: 1.0
148	49	property bool greeterShown: false	46	property bool greeterShown: false
149			47	property bool hasKeyboard: false
150	50		48
151	51	property string mode: "staged"	49	property string mode: "staged"
152	52		50
153	@@ -337,12 +335,12 @@
154	337	objectName: identifier+"-panelItem"	335	objectName: identifier+"-panelItem"
155	338		336
156	339	property int ownIndex: index	337	property int ownIndex: index
159	340	property bool overflow: parent.width - x > __indicators.overFlowWidth	338	readonly property bool overflow: parent.width - x > __indicators.overFlowWidth
160	341	property bool hidden: !expanded && (overflow \|\| !indicatorVisible \|\| hideSessionIndicator \|\| hideKeyboardIndicator)	339	readonly property bool hidden: !expanded && (overflow \|\| !indicatorVisible \|\| hideSessionIndicator \|\| hideKeyboardIndicator)
161	342	// HACK for indicator-session	340	// HACK for indicator-session
162	343	readonly property bool hideSessionIndicator: identifier == "indicator-session" && Math.min(Screen.width, Screen.height) <= units.gu(60)	341	readonly property bool hideSessionIndicator: identifier == "indicator-session" && Math.min(Screen.width, Screen.height) <= units.gu(60)
163	344	// HACK for indicator-keyboard	342	// HACK for indicator-keyboard
165	345	readonly property bool hideKeyboardIndicator: identifier == "indicator-keyboard" && (AccountsService.keymaps.length < 2 \|\| keyboardsModel.count == 0)	343	readonly property bool hideKeyboardIndicator: identifier == "indicator-keyboard" && !hasKeyboard
166	346		344
167	347	height: parent.height	345	height: parent.height
168	348	expanded: indicators.expanded	346	expanded: indicators.expanded
169	@@ -396,11 +394,6 @@
170	396	}	394	}
171	397	}	395	}
172	398		396
173	399	InputDeviceModel {
174	400	id: keyboardsModel
175	401	deviceFilter: InputInfo.Keyboard
176	402	}
177	403
178	404	IndicatorsLight {	397	IndicatorsLight {
179	405	id: indicatorLights	398	id: indicatorLights
180	406	}	399	}
181	407		400
182	=== modified file 'qml/Shell.qml'
183	--- qml/Shell.qml 2017-02-16 13:43:56 +0000
184	+++ qml/Shell.qml 2017-02-28 13:38:13 +0000
185	@@ -533,6 +533,7 @@
186	533	fullscreenMode: (focusedSurfaceIsFullscreen && !LightDMService.greeter.active && launcher.progress == 0 && !stage.spreadShown)	533	fullscreenMode: (focusedSurfaceIsFullscreen && !LightDMService.greeter.active && launcher.progress == 0 && !stage.spreadShown)
187	534	\|\| greeter.hasLockedApp	534	\|\| greeter.hasLockedApp
188	535	greeterShown: greeter && greeter.shown	535	greeterShown: greeter && greeter.shown
189			536	hasKeyboard: shell.hasKeyboard
190	536	}	537	}
191	537		538
192	538	Launcher {	539	Launcher {
193	539		540
194	=== modified file 'tests/qmltests/Panel/tst_Panel.qml'
195	--- tests/qmltests/Panel/tst_Panel.qml 2017-01-24 07:44:18 +0000
196	+++ tests/qmltests/Panel/tst_Panel.qml 2017-02-28 13:38:13 +0000
197	@@ -272,6 +272,7 @@
198	272	}	272	}
199	273		273
200	274	function cleanup() {	274	function cleanup() {
201			275	panel.hasKeyboard = false;
202	275	panel.indicators.hide();	276	panel.indicators.hide();
203	276	panel.applicationMenus.hide();	277	panel.applicationMenus.hide();
204	277	waitForAllAnimationToComplete("initial");	278	waitForAllAnimationToComplete("initial");
205	@@ -713,8 +714,8 @@
206	713	{ tag: "No keyboard, no keymap", keyboard: false, keymaps: [], hidden: true },	714	{ tag: "No keyboard, no keymap", keyboard: false, keymaps: [], hidden: true },
207	714	{ tag: "No keyboard, one keymap", keyboard: false, keymaps: ["us"], hidden: true },	715	{ tag: "No keyboard, one keymap", keyboard: false, keymaps: ["us"], hidden: true },
208	715	{ tag: "No keyboard, 2 keymaps", keyboard: false, keymaps: ["us", "cs"], hidden: true },	716	{ tag: "No keyboard, 2 keymaps", keyboard: false, keymaps: ["us", "cs"], hidden: true },
211	716	{ tag: "Keyboard, no keymap", keyboard: true, keymaps: [], hidden: true },	717	{ tag: "Keyboard, no keymap", keyboard: true, keymaps: [], hidden: false },
212	717	{ tag: "Keyboard, one keymap", keyboard: true, keymaps: ["us"], hidden: true },	718	{ tag: "Keyboard, one keymap", keyboard: true, keymaps: ["us"], hidden: false },
213	718	{ tag: "Keyboard, 2 keymaps", keyboard: true, keymaps: ["us", "cs"], hidden: false }	719	{ tag: "Keyboard, 2 keymaps", keyboard: true, keymaps: ["us", "cs"], hidden: false }
214	719	];	720	];
215	720	}	721	}
216	@@ -722,6 +723,7 @@
217	722	function test_hidingKeyboardIndicator(data) {	723	function test_hidingKeyboardIndicator(data) {
218	723	var item = findChild(panel, "indicator-keyboard-panelItem");	724	var item = findChild(panel, "indicator-keyboard-panelItem");
219	724	AccountsService.keymaps = data.keymaps;	725	AccountsService.keymaps = data.keymaps;
220			726	panel.hasKeyboard = data.keyboard;
221	725	if (data.keyboard) {	727	if (data.keyboard) {
222	726	MockInputDeviceBackend.addMockDevice("/indicator_kbd0", InputInfo.Keyboard);	728	MockInputDeviceBackend.addMockDevice("/indicator_kbd0", InputInfo.Keyboard);
223	727	} else {	729	} else {
224	@@ -734,11 +736,12 @@
225	734	function test_visibleIndicators_data() {	736	function test_visibleIndicators_data() {
226	735	return [	737	return [
227	736	{ visible: [true, false, true, false, true, true, false, true] },	738	{ visible: [true, false, true, false, true, true, false, true] },
229	737	{ visible: [false, false, false, false, false, false, true, false] }	739	{ visible: [true, false, false, false, false, false, true, false] }
230	738	];	740	];
231	739	}	741	}
232	740		742
233	741	function test_visibleIndicators(data) {	743	function test_visibleIndicators(data) {
234			744	panel.hasKeyboard = true;
235	742	for (var i = 0; i < data.visible.length; i++) {	745	for (var i = 0; i < data.visible.length; i++) {
236	743	var visible = data.visible[i];	746	var visible = data.visible[i];
237	744	root.setIndicatorVisible(i, visible);	747	root.setIndicatorVisible(i, visible);