sessonMode: Remove 'lock-screen' mode
As per the latest mockups, the only session mode related to locked screens will be the unlock dialog.
This commit is contained in:
parent
fe3d55eb80
commit
d1f61e884d
@ -489,8 +489,8 @@ var ScreenShield = class {
|
|||||||
|
|
||||||
this._lockDialogGroup.grab_key_focus();
|
this._lockDialogGroup.grab_key_focus();
|
||||||
|
|
||||||
if (Main.sessionMode.currentMode != 'lock-screen')
|
if (Main.sessionMode.currentMode != 'unlock-dialog')
|
||||||
Main.sessionMode.pushMode('lock-screen');
|
Main.sessionMode.pushMode('unlock-dialog');
|
||||||
}
|
}
|
||||||
|
|
||||||
_lockScreenShown(params) {
|
_lockScreenShown(params) {
|
||||||
@ -547,8 +547,6 @@ var ScreenShield = class {
|
|||||||
_continueDeactivate(animate) {
|
_continueDeactivate(animate) {
|
||||||
this._hideLockScreen();
|
this._hideLockScreen();
|
||||||
|
|
||||||
if (Main.sessionMode.currentMode == 'lock-screen')
|
|
||||||
Main.sessionMode.popMode('lock-screen');
|
|
||||||
if (Main.sessionMode.currentMode == 'unlock-dialog')
|
if (Main.sessionMode.currentMode == 'unlock-dialog')
|
||||||
Main.sessionMode.popMode('unlock-dialog');
|
Main.sessionMode.popMode('unlock-dialog');
|
||||||
|
|
||||||
@ -614,8 +612,7 @@ var ScreenShield = class {
|
|||||||
|
|
||||||
this.actor.show();
|
this.actor.show();
|
||||||
|
|
||||||
if (Main.sessionMode.currentMode != 'unlock-dialog' &&
|
if (Main.sessionMode.currentMode != 'unlock-dialog') {
|
||||||
Main.sessionMode.currentMode != 'lock-screen') {
|
|
||||||
this._isGreeter = Main.sessionMode.isGreeter;
|
this._isGreeter = Main.sessionMode.isGreeter;
|
||||||
if (!this._isGreeter)
|
if (!this._isGreeter)
|
||||||
Main.sessionMode.pushMode('unlock-dialog');
|
Main.sessionMode.pushMode('unlock-dialog');
|
||||||
|
@ -53,19 +53,6 @@ const _modes = {
|
|||||||
panelStyle: 'login-screen'
|
panelStyle: 'login-screen'
|
||||||
},
|
},
|
||||||
|
|
||||||
'lock-screen': {
|
|
||||||
isLocked: true,
|
|
||||||
isGreeter: undefined,
|
|
||||||
unlockDialog: undefined,
|
|
||||||
components: ['polkitAgent', 'telepathyClient'],
|
|
||||||
panel: {
|
|
||||||
left: [],
|
|
||||||
center: [],
|
|
||||||
right: ['aggregateMenu']
|
|
||||||
},
|
|
||||||
panelStyle: 'lock-screen'
|
|
||||||
},
|
|
||||||
|
|
||||||
'unlock-dialog': {
|
'unlock-dialog': {
|
||||||
isLocked: true,
|
isLocked: true,
|
||||||
unlockDialog: undefined,
|
unlockDialog: undefined,
|
||||||
|
Loading…
Reference in New Issue
Block a user