git.iko.soy/unity8
on xenial help sign in
Hide greeter on incoming call
ca78ba9Michael Terry
Components/ApplicationManagerWrapper.qml−29
compare with xenial
unifiedsplit
@@ -25,7 +25,6 @@ Item {
25 property variant mainStageFocusedApplication: null
25 property variant mainStageFocusedApplication: null
26 property variant sideStageFocusedApplication: null
26 property variant sideStageFocusedApplication: null
27 property bool sideStageEnabled: true
27 property bool sideStageEnabled: true
28− signal focusRequested(string desktopFile)
29 property bool keyboardVisible: ApplicationManager.keyboardVisible
28 property bool keyboardVisible: ApplicationManager.keyboardVisible
30 property int keyboardHeight: ApplicationManager.keyboardHeight
29 property int keyboardHeight: ApplicationManager.keyboardHeight
31
30
@@ -155,32 +154,4 @@ Item {
155 }
154 }
156 return desktopFile.substring(left+1, right);
155 return desktopFile.substring(left+1, right);
157 }
156 }
158−
159− Connections {
160− target: ApplicationManager
161− onFocusRequested: {
162− // FIXME: hardcoded mapping from ApplicationManager.FavoriteApplications
163− // enum to desktop files
164− var desktopFile
165− if (favoriteApplication == ApplicationManager.CameraApplication) {
166− desktopFile = "/usr/share/applications/camera-app.desktop"
167− } else if (favoriteApplication == ApplicationManager.GalleryApplication) {
168− desktopFile = "/usr/share/applications/gallery-app.desktop"
169− } else if (favoriteApplication == ApplicationManager.ShareApplication) {
170− desktopFile = "/usr/share/applications/share-app.desktop"
171− } else if (favoriteApplication == ApplicationManager.BrowserApplication) {
172− desktopFile = "/usr/share/applications/webbrowser-app.desktop"
173− } else if (favoriteApplication == ApplicationManager.PhoneApplication) {
174− desktopFile = "/usr/share/applications/phone-app.desktop"
175− } else if (favoriteApplication == ApplicationManager.DialerApplication) {
176− desktopFile = "/usr/share/applications/dialer-app.desktop"
177− } else if (favoriteApplication == ApplicationManager.MessagingApplication) {
178− desktopFile = "/usr/share/applications/messaging-app.desktop"
179− } else if (favoriteApplication == ApplicationManager.AddressbookApplication) {
180− desktopFile = "/usr/share/applications/address-book-app.desktop"
181− }
182−
183− applicationManager.focusRequested(desktopFile);
184− }
185− }
186}
157}
Shell.qml+6−10
@@ -84,7 +84,6 @@ FocusScope {
84
84
85 readonly property bool applicationFocused: !!applicationManager.mainStageFocusedApplication
85 readonly property bool applicationFocused: !!applicationManager.mainStageFocusedApplication
86 || !!applicationManager.sideStageFocusedApplication
86 || !!applicationManager.sideStageFocusedApplication
87− // Used for autopilot testing.
88 readonly property string currentFocusedAppId: ApplicationManager.focusedApplicationId
87 readonly property string currentFocusedAppId: ApplicationManager.focusedApplicationId
89
88
90 readonly property bool fullscreenMode: {
89 readonly property bool fullscreenMode: {
@@ -99,15 +98,12 @@ FocusScope {
99 }
98 }
100 }
99 }
101
100
102− Connections {
101+ onCurrentFocusedAppIdChanged: {
103− target: applicationManager
102+ // If any app is focused when greeter is open, it's due to a user action
104− ignoreUnknownSignals: true
103+ // like a snap decision (say, an incoming call).
105− onFocusRequested: {
106− // TODO: this should be protected to only unlock for certain applications / certain usecases
104+ // TODO: this should be protected to only unlock for certain applications / certain usecases
107− // potentially only in connection with a notification
105+ // potentially only in connection with a notification.
108− greeter.hide();
106+ greeter.hide()
109− shell.activateApplication(desktopFile);
110− }
111 }
107 }
112
108
113 function activateApplication(desktopFile, argument) {
109 function activateApplication(desktopFile, argument) {