c9648b7 · unity8 · git.iko.soy

git.iko.soy/unity8

Hide the greeter when an app is focused, fixing snap decisions launching an app in the greeter (like receiving a call).

c9648b7Michael Terry13 years ago

Components/ApplicationManagerWrapper.qml−29

compare with xenial

unifiedsplit

@@ -25,7 +25,6 @@ Item {

25 property variant mainStageFocusedApplication: null

26 property variant sideStageFocusedApplication: null

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

@@ -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+46−34

@@ -99,17 +99,6 @@ FocusScope {

99 }

100 }

101

102− Connections {

103− target: applicationManager

104− ignoreUnknownSignals: true

105− onFocusRequested: {

106− // TODO: this should be protected to only unlock for certain applications / certain usecases

107− // potentially only in connection with a notification

108− greeter.hide();

109− shell.activateApplication(desktopFile);

110− }

111− }

112−

113 function activateApplication(desktopFile, argument) {

102 function activateApplication(desktopFile, argument) {

114 if (applicationManager) {

103 if (applicationManager) {

115 // For newly started applications, as it takes them time to draw their first frame

104 // For newly started applications, as it takes them time to draw their first frame

@@ -468,6 +457,26 @@ FocusScope {

468

457

469 dragHandleWidth: shell.edgeSize

458 dragHandleWidth: shell.edgeSize

470

459

460+ property var previousMainApp: null

461+ property var previousSideApp: null

462+

463+ function removeApplicationFocus() {

464+ greeter.previousMainApp = applicationManager.mainStageFocusedApplication;

465+ greeter.previousSideApp = applicationManager.sideStageFocusedApplication;

466+ applicationManager.unfocusCurrentApplication();

467+ }

468+

469+ function restoreApplicationFocus() {

470+ if (greeter.previousMainApp) {

471+ applicationManager.focusApplication(greeter.previousMainApp);

472+ greeter.previousMainApp = null;

473+ }

474+ if (greeter.previousSideApp) {

475+ applicationManager.focusApplication(greeter.previousSideApp);

476+ greeter.previousSideApp = null;

477+ }

478+ }

479+

471 onShownChanged: {

480 onShownChanged: {

472 if (shown) {

481 if (shown) {

473 lockscreen.reset();

482 lockscreen.reset();

@@ -478,6 +487,9 @@ FocusScope {

478 greeter.selected(0);

487 greeter.selected(0);

479 }

488 }

480 greeter.forceActiveFocus();

489 greeter.forceActiveFocus();

490+ removeApplicationFocus();

491+ } else {

492+ restoreApplicationFocus();

481 }

493 }

482 }

494 }

483

495

@@ -494,6 +506,29 @@ FocusScope {

494 launcher.tease();

506 launcher.tease();

495 }

507 }

496 }

508 }

509+

510+ Connections {

511+ target: applicationManager

512+ ignoreUnknownSignals: true

513+ // If any app is focused when greeter is open, it's due to a user action

514+ // like a snap decision (say, an incoming call).

515+ // TODO: these should be protected to only unlock for certain applications / certain usecases

516+ // potentially only in connection with a notification.

517+ onMainStageFocusedApplicationChanged: {

518+ if (greeter.shown && applicationManager.mainStageFocusedApplication) {

519+ greeter.previousMainApp = null // make way for new focused app

520+ greeter.previousSideApp = null

521+ greeter.hide()

522+ }

523+ }

524+ onSideStageFocusedApplicationChanged: {

525+ if (greeter.shown && applicationManager.sideStageFocusedApplication) {

526+ greeter.previousMainApp = null // make way for new focused app

527+ greeter.previousSideApp = null

528+ greeter.hide()

529+ }

530+ }

531+ }

497 }

532 }

498

533

499 InputFilterArea {

534 InputFilterArea {

@@ -506,34 +541,11 @@ FocusScope {

506 id: powerConnection

541 id: powerConnection

507 target: Powerd

542 target: Powerd

508

543

509− property var previousMainApp: null

510− property var previousSideApp: null

511−

512− function setFocused(focused) {

513− if (!focused) {

514− powerConnection.previousMainApp = applicationManager.mainStageFocusedApplication;

515− powerConnection.previousSideApp = applicationManager.sideStageFocusedApplication;

516− applicationManager.unfocusCurrentApplication();

517− } else {

518− if (powerConnection.previousMainApp) {

519− applicationManager.focusApplication(powerConnection.previousMainApp);

520− powerConnection.previousMainApp = null;

521− }

522− if (powerConnection.previousSideApp) {

523− applicationManager.focusApplication(powerConnection.previousSideApp);

524− powerConnection.previousSideApp = null;

525− }

526− }

527− }

528−

529 onDisplayPowerStateChange: {

544 onDisplayPowerStateChange: {

530 // We ignore any display-off signals when the proximity sensor

545 // We ignore any display-off signals when the proximity sensor

531 // is active. This usually indicates something like a phone call.

546 // is active. This usually indicates something like a phone call.

532 if (status == Powerd.Off && (flags & Powerd.UseProximity) == 0) {

547 if (status == Powerd.Off && (flags & Powerd.UseProximity) == 0) {

533− powerConnection.setFocused(false);

534 greeter.showNow();

548 greeter.showNow();

535− } else if (status == Powerd.On) {

536− powerConnection.setFocused(true);

537 }

549 }

538

550

539 // No reason to chew demo CPU when user isn't watching

551 // No reason to chew demo CPU when user isn't watching

tests/qmltests/tst_Shell.qml+6−2

@@ -157,7 +157,7 @@ Item {

157 waitUntilApplicationWindowIsFullyVisible();

158

159 var mainApp = ApplicationManager.focusedApplicationId;

160− tryCompareFunction(function() { return mainApp != ""; }, true);

160+ verify(mainApp != "");

161

162 // Try to suspend while proximity is engaged...

163 Powerd.displayPowerStateChange(Powerd.Off, Powerd.UseProximity);

@@ -170,8 +170,12 @@ Item {

170

171 // And wake up

172 Powerd.displayPowerStateChange(Powerd.On, 0);

173− tryCompare(ApplicationManager, "focusedApplicationId", mainApp);

173+ tryCompare(ApplicationManager, "focusedApplicationId", "");

174 tryCompare(greeter, "showProgress", 1);

175+

176+ // Swipe away greeter to focus app

177+ swipeAwayGreeter();

178+ tryCompare(ApplicationManager, "focusedApplicationId", mainApp);

175 }

179 }

176

180

177 function swipeAwayGreeter() {

181 function swipeAwayGreeter() {