@@ -70,9 +70,9 @@ Item {
7070 }
7171 }
7272
73− function setFakeActiveForApp(app) {
73+ function setLockedApp(app) {
7474 if (shell.locked) {
75− greeter.fakeActiveForApp = app
75+ greeter.lockedApp = app
7676 lockscreen.hide()
7777 }
7878 }
@@ -142,8 +142,8 @@ Item {
142142 if (appId === "dialer-app") {
143143 // Always let the dialer-app through. Either user asked
144144 // for an emergency call or accepted an incoming call.
145− setFakeActiveForApp(appId)
146− } else if (greeter.fakeActiveForApp !== "" && greeter.fakeActiveForApp !== appId) {
145+ setLockedApp(appId)
146+ } else if (greeter.hasLockedApp && greeter.lockedApp !== appId) {
147147 lockscreen.show();
148148 }
149149 greeter.hide();
@@ -151,7 +151,7 @@ Item {
151151 }
152152
153153 onFocusedApplicationIdChanged: {
154− if (greeter.fakeActiveForApp !== "" && greeter.fakeActiveForApp !== ApplicationManager.focusedApplicationId) {
154+ if (greeter.hasLockedApp && greeter.lockedApp !== ApplicationManager.focusedApplicationId) {
155155 lockscreen.show();
156156 }
157157 panel.indicators.hide();
@@ -164,7 +164,7 @@ Item {
164164 if (appId === "dialer-app") {
165165 // Always let the dialer-app through. Either user asked
166166 // for an emergency call or accepted an incoming call.
167− setFakeActiveForApp(appId)
167+ setLockedApp(appId)
168168 }
169169 launcher.hide();
170170 }
@@ -174,8 +174,8 @@ Item {
174174 id: applicationsDisplayLoader
175175 anchors.fill: parent
176176
177− // When in the "fakeActiveForApp" mode, we only want to show that one app
178− source: (shell.sideStageEnabled && greeter.fakeActiveForApp !== "") ? "Stages/TabletStage.qml" : "Stages/PhoneStage.qml"
177+ // When we have a locked app, we only want to show that one app
178+ source: (shell.sideStageEnabled && !greeter.hasLockedApp) ? "Stages/TabletStage.qml" : "Stages/PhoneStage.qml"
179179
180180 Binding {
181181 target: applicationsDisplayLoader.item
@@ -201,7 +201,7 @@ Item {
201201 Binding {
202202 target: applicationsDisplayLoader.item
203203 property: "spreadEnabled"
204− value: edgeDemo.stagesEnabled && greeter.fakeActiveForApp === "" // to support emergency dialer hack
204+ value: edgeDemo.stagesEnabled && !greeter.hasLockedApp // to support emergency dialer hack
205205 }
206206 Binding {
207207 target: applicationsDisplayLoader.item
@@ -271,7 +271,7 @@ Item {
271271 onCancel: greeter.show()
272272 onEmergencyCall: shell.activateApplication("dialer-app") // will automatically enter fake-active mode
273273
274− onShownChanged: if (shown) greeter.fakeActiveForApp = ""
274+ onShownChanged: if (shown) greeter.lockedApp = ""
275275
276276 Component.onCompleted: {
277277 if (greeter.narrowMode) {
@@ -359,7 +359,7 @@ Item {
359359 Binding {
360360 target: LightDM.Greeter
361361 property: "active"
362− value: greeter.shown || lockscreen.shown || greeter.fakeActiveForApp != ""
362+ value: greeter.shown || lockscreen.shown || greeter.hasLockedApp
363363 }
364364
365365 Rectangle {
@@ -399,7 +399,8 @@ Item {
399399
400400 signal sessionStarted() // helpful for tests
401401
402− property string fakeActiveForApp: ""
402+ property string lockedApp: ""
403+ property bool hasLockedApp: lockedApp !== ""
403404
404405 available: true
405406 hides: [launcher, panel.indicators]
@@ -429,7 +430,7 @@ Item {
429430 if (greeter.narrowMode) {
430431 LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
431432 }
432− greeter.fakeActiveForApp = "";
433+ greeter.lockedApp = "";
433434 greeter.forceActiveFocus();
434435 }
435436 }
@@ -510,7 +511,7 @@ Item {
510511 anchors.fill: parent //because this draws indicator menus
511512 indicators {
512513 hides: [launcher]
513− available: edgeDemo.panelEnabled && (!shell.locked || AccountsService.enableIndicatorsWhileLocked) && greeter.fakeActiveForApp === ""
514+ available: edgeDemo.panelEnabled && (!shell.locked || AccountsService.enableIndicatorsWhileLocked) && !greeter.hasLockedApp
514515 contentEnabled: edgeDemo.panelContentEnabled
515516 width: parent.width > units.gu(60) ? units.gu(40) : parent.width
516517 panelHeight: units.gu(3)
@@ -521,7 +522,7 @@ Item {
521522 ApplicationManager.findApplication(ApplicationManager.focusedApplicationId).fullscreen
522523
523524 fullscreenMode: (topmostApplicationIsFullscreen && !LightDM.Greeter.active && launcher.progress == 0)
524− || greeter.fakeActiveForApp !== ""
525+ || greeter.hasLockedApp
525526 }
526527
527528 Launcher {
@@ -534,7 +535,7 @@ Item {
534535 anchors.bottom: parent.bottom
535536 width: parent.width
536537 dragAreaWidth: shell.edgeSize
537− available: edgeDemo.launcherEnabled && (!shell.locked || AccountsService.enableLauncherWhileLocked) && greeter.fakeActiveForApp === ""
538+ available: edgeDemo.launcherEnabled && (!shell.locked || AccountsService.enableLauncherWhileLocked) && !greeter.hasLockedApp
538539
539540 onShowDashHome: showHome()
540541 onDash: showDash()
@@ -544,7 +545,7 @@ Item {
544545 }
545546 }
546547 onLauncherApplicationSelected: {
547− if (greeter.fakeActiveForApp !== "") {
548+ if (greeter.hasLockedApp) {
548549 lockscreen.show()
549550 }
550551 if (!edgeDemo.running)