git.iko.soy/unity8
on xenial help sign in
Rename fakeActiveForApp for clarity
2da0602Michael Terry
qml/Shell.qml+18−17
compare with xenial
unifiedsplit
@@ -70,9 +70,9 @@ Item {
70 }
70 }
71 }
71 }
72
72
73− function setFakeActiveForApp(app) {
73+ function setLockedApp(app) {
74 if (shell.locked) {
74 if (shell.locked) {
75− greeter.fakeActiveForApp = app
75+ greeter.lockedApp = app
76 lockscreen.hide()
76 lockscreen.hide()
77 }
77 }
78 }
78 }
@@ -142,8 +142,8 @@ Item {
142 if (appId === "dialer-app") {
142 if (appId === "dialer-app") {
143 // Always let the dialer-app through. Either user asked
143 // Always let the dialer-app through. Either user asked
144 // for an emergency call or accepted an incoming call.
144 // for an emergency call or accepted an incoming call.
145− setFakeActiveForApp(appId)
145+ setLockedApp(appId)
146− } else if (greeter.fakeActiveForApp !== "" && greeter.fakeActiveForApp !== appId) {
146+ } else if (greeter.hasLockedApp && greeter.lockedApp !== appId) {
147 lockscreen.show();
147 lockscreen.show();
148 }
148 }
149 greeter.hide();
149 greeter.hide();
@@ -151,7 +151,7 @@ Item {
151 }
151 }
152
152
153 onFocusedApplicationIdChanged: {
153 onFocusedApplicationIdChanged: {
154− if (greeter.fakeActiveForApp !== "" && greeter.fakeActiveForApp !== ApplicationManager.focusedApplicationId) {
154+ if (greeter.hasLockedApp && greeter.lockedApp !== ApplicationManager.focusedApplicationId) {
155 lockscreen.show();
155 lockscreen.show();
156 }
156 }
157 panel.indicators.hide();
157 panel.indicators.hide();
@@ -164,7 +164,7 @@ Item {
164 if (appId === "dialer-app") {
164 if (appId === "dialer-app") {
165 // Always let the dialer-app through. Either user asked
165 // Always let the dialer-app through. Either user asked
166 // for an emergency call or accepted an incoming call.
166 // for an emergency call or accepted an incoming call.
167− setFakeActiveForApp(appId)
167+ setLockedApp(appId)
168 }
168 }
169 launcher.hide();
169 launcher.hide();
170 }
170 }
@@ -174,8 +174,8 @@ Item {
174 id: applicationsDisplayLoader
174 id: applicationsDisplayLoader
175 anchors.fill: parent
175 anchors.fill: parent
176
176
177− // When in the "fakeActiveForApp" mode, we only want to show that one app
177+ // When we have a locked app, we only want to show that one app
178− source: (shell.sideStageEnabled && greeter.fakeActiveForApp !== "") ? "Stages/TabletStage.qml" : "Stages/PhoneStage.qml"
178+ source: (shell.sideStageEnabled && !greeter.hasLockedApp) ? "Stages/TabletStage.qml" : "Stages/PhoneStage.qml"
179
179
180 Binding {
180 Binding {
181 target: applicationsDisplayLoader.item
181 target: applicationsDisplayLoader.item
@@ -201,7 +201,7 @@ Item {
201 Binding {
201 Binding {
202 target: applicationsDisplayLoader.item
202 target: applicationsDisplayLoader.item
203 property: "spreadEnabled"
203 property: "spreadEnabled"
204− value: edgeDemo.stagesEnabled && greeter.fakeActiveForApp === "" // to support emergency dialer hack
204+ value: edgeDemo.stagesEnabled && !greeter.hasLockedApp // to support emergency dialer hack
205 }
205 }
206 Binding {
206 Binding {
207 target: applicationsDisplayLoader.item
207 target: applicationsDisplayLoader.item
@@ -271,7 +271,7 @@ Item {
271 onCancel: greeter.show()
271 onCancel: greeter.show()
272 onEmergencyCall: shell.activateApplication("dialer-app") // will automatically enter fake-active mode
272 onEmergencyCall: shell.activateApplication("dialer-app") // will automatically enter fake-active mode
273
273
274− onShownChanged: if (shown) greeter.fakeActiveForApp = ""
274+ onShownChanged: if (shown) greeter.lockedApp = ""
275
275
276 Component.onCompleted: {
276 Component.onCompleted: {
277 if (greeter.narrowMode) {
277 if (greeter.narrowMode) {
@@ -359,7 +359,7 @@ Item {
359 Binding {
359 Binding {
360 target: LightDM.Greeter
360 target: LightDM.Greeter
361 property: "active"
361 property: "active"
362− value: greeter.shown || lockscreen.shown || greeter.fakeActiveForApp != ""
362+ value: greeter.shown || lockscreen.shown || greeter.hasLockedApp
363 }
363 }
364
364
365 Rectangle {
365 Rectangle {
@@ -399,7 +399,8 @@ Item {
399
399
400 signal sessionStarted() // helpful for tests
400 signal sessionStarted() // helpful for tests
401
401
402− property string fakeActiveForApp: ""
402+ property string lockedApp: ""
403+ property bool hasLockedApp: lockedApp !== ""
403
404
404 available: true
405 available: true
405 hides: [launcher, panel.indicators]
406 hides: [launcher, panel.indicators]
@@ -429,7 +430,7 @@ Item {
429 if (greeter.narrowMode) {
430 if (greeter.narrowMode) {
430 LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
431 LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
431 }
432 }
432− greeter.fakeActiveForApp = "";
433+ greeter.lockedApp = "";
433 greeter.forceActiveFocus();
434 greeter.forceActiveFocus();
434 }
435 }
435 }
436 }
@@ -510,7 +511,7 @@ Item {
510 anchors.fill: parent //because this draws indicator menus
511 anchors.fill: parent //because this draws indicator menus
511 indicators {
512 indicators {
512 hides: [launcher]
513 hides: [launcher]
513− available: edgeDemo.panelEnabled && (!shell.locked || AccountsService.enableIndicatorsWhileLocked) && greeter.fakeActiveForApp === ""
514+ available: edgeDemo.panelEnabled && (!shell.locked || AccountsService.enableIndicatorsWhileLocked) && !greeter.hasLockedApp
514 contentEnabled: edgeDemo.panelContentEnabled
515 contentEnabled: edgeDemo.panelContentEnabled
515 width: parent.width > units.gu(60) ? units.gu(40) : parent.width
516 width: parent.width > units.gu(60) ? units.gu(40) : parent.width
516 panelHeight: units.gu(3)
517 panelHeight: units.gu(3)
@@ -521,7 +522,7 @@ Item {
521 ApplicationManager.findApplication(ApplicationManager.focusedApplicationId).fullscreen
522 ApplicationManager.findApplication(ApplicationManager.focusedApplicationId).fullscreen
522
523
523 fullscreenMode: (topmostApplicationIsFullscreen && !LightDM.Greeter.active && launcher.progress == 0)
524 fullscreenMode: (topmostApplicationIsFullscreen && !LightDM.Greeter.active && launcher.progress == 0)
524− || greeter.fakeActiveForApp !== ""
525+ || greeter.hasLockedApp
525 }
526 }
526
527
527 Launcher {
528 Launcher {
@@ -534,7 +535,7 @@ Item {
534 anchors.bottom: parent.bottom
535 anchors.bottom: parent.bottom
535 width: parent.width
536 width: parent.width
536 dragAreaWidth: shell.edgeSize
537 dragAreaWidth: shell.edgeSize
537− available: edgeDemo.launcherEnabled && (!shell.locked || AccountsService.enableLauncherWhileLocked) && greeter.fakeActiveForApp === ""
538+ available: edgeDemo.launcherEnabled && (!shell.locked || AccountsService.enableLauncherWhileLocked) && !greeter.hasLockedApp
538
539
539 onShowDashHome: showHome()
540 onShowDashHome: showHome()
540 onDash: showDash()
541 onDash: showDash()
@@ -544,7 +545,7 @@ Item {
544 }
545 }
545 }
546 }
546 onLauncherApplicationSelected: {
547 onLauncherApplicationSelected: {
547− if (greeter.fakeActiveForApp !== "") {
548+ if (greeter.hasLockedApp) {
548 lockscreen.show()
549 lockscreen.show()
549 }
550 }
550 if (!edgeDemo.running)
551 if (!edgeDemo.running)
tests/qmltests/tst_ShellWithPin.qml+4−2
@@ -168,7 +168,8 @@ Item {
168
168
169 mouseClick(emergencyButton, units.gu(1), units.gu(1))
169 mouseClick(emergencyButton, units.gu(1), units.gu(1))
170
170
171− tryCompare(greeter, "fakeActiveForApp", "dialer-app")
171+ tryCompare(greeter, "lockedApp", "dialer-app")
172+ tryCompare(greeter, "hasLockedApp", true)
172 tryCompare(lockscreen, "shown", false)
173 tryCompare(lockscreen, "shown", false)
173 tryCompare(panel, "fullscreenMode", true)
174 tryCompare(panel, "fullscreenMode", true)
174 tryCompare(indicators, "available", false)
175 tryCompare(indicators, "available", false)
@@ -180,7 +181,8 @@ Item {
180 LightDM.Greeter.showGreeter()
181 LightDM.Greeter.showGreeter()
181
182
182 tryCompare(greeter, "shown", true)
183 tryCompare(greeter, "shown", true)
183− tryCompare(greeter, "fakeActiveForApp", "")
184+ tryCompare(greeter, "lockedApp", "")
185+ tryCompare(greeter, "hasLockedApp", false)
184 tryCompare(lockscreen, "shown", true)
186 tryCompare(lockscreen, "shown", true)
185 tryCompare(panel, "fullscreenMode", false)
187 tryCompare(panel, "fullscreenMode", false)
186 tryCompare(indicators, "available", true)
188 tryCompare(indicators, "available", true)