git.iko.soy/unity8
on xenial help sign in
Only upgrade dialer-app to a lockedApp if we're already locked
c3f8c9aMichael Terry
qml/Shell.qml+1−1
compare with xenial
unifiedsplit
@@ -174,7 +174,7 @@ Item {
174 target: ApplicationManager
174 target: ApplicationManager
175 onFocusRequested: {
175 onFocusRequested: {
176 if (greeter.narrowMode) {
176 if (greeter.narrowMode) {
177− if (appId === "dialer-app" && callManager.hasCalls) {
177+ if (appId === "dialer-app" && callManager.hasCalls && shell.locked) {
178 // If we are in the middle of a call, make dialer lockedApp and show it.
178 // If we are in the middle of a call, make dialer lockedApp and show it.
179 // This can happen if user backs out of dialer back to greeter, then
179 // This can happen if user backs out of dialer back to greeter, then
180 // launches dialer again.
180 // launches dialer again.