extensions-tool: Add option to list updates

Now that we support extension updates, it may be useful to list pending updates from the command line. It's easy enough to support, so add a corresponding option to the list command. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/988
background: Remove noise texture
2020-02-10 22:43:00 +00:00 · 2020-02-10 22:30:52 +00:00 · 2020-02-10 22:30:52 +00:00 · 2020-02-10 22:30:52 +00:00 · 2020-02-10 22:30:52 +00:00 · 2020-02-10 22:30:52 +00:00
29 changed files with 5322 additions and 4403 deletions
--- a/data/gnome-shell-theme.gresource.xml
+++ b/data/gnome-shell-theme.gresource.xml
@@ -18,7 +18,6 @@
    <file alias="icons/message-indicator-symbolic.svg">message-indicator-symbolic.svg</file>
    <file>no-events.svg</file>
    <file>no-notifications.svg</file>
-    <file>noise-texture.png</file>
    <file>pad-osd.css</file>
    <file alias="icons/eye-open-negative-filled-symbolic.svg">eye-open-negative-filled-symbolic.svg</file>
    <file alias="icons/eye-not-looking-symbolic.svg">eye-not-looking-symbolic.svg</file>
--- a/data/theme/gnome-shell-sass/widgets/_panel.scss
+++ b/data/theme/gnome-shell-sass/widgets/_panel.scss
@@ -15,8 +15,7 @@ $panel_height: 1.86em;

  // transparent panel on lock & login screens
  &.unlock-screen,
-  &.login-screen,
-  &.lock-screen {
+  &.login-screen {
    background-color: transparent;

    .panel-corner {
@@ -77,8 +76,7 @@ $panel_height: 1.86em;

    // lock & login screen styles
    .unlock-screen &,
-    .login-screen &,
-    .lock-screen & {
+    .login-screen & {
      color: lighten($fg_color, 10%);
      &:focus, &:hover, &:active { color: lighten($fg_color, 10%); }
    }
--- a/data/theme/gnome-shell-sass/widgets/_screen-shield.scss
+++ b/data/theme/gnome-shell-sass/widgets/_screen-shield.scss
@@ -1,68 +1,53 @@
 /* Screen Shield */

-$_screenshield_shadow: 0px 0px 6px rgba(0, 0, 0, 0.726);
-
-.screen-shield-arrows {
-  padding-bottom: 3em;
-}
-
-.screen-shield-arrows Gjs_Arrow {
+.unlock-dialog-clock {
  color: white;
-  width: 80px;
-  height: 48px;
-  -arrow-thickness: 12px;
-  -arrow-shadow: $_screenshield_shadow;
-}
-
-.screen-shield-clock {
-  color: white;
-  text-shadow: $_screenshield_shadow;
-  font-weight: bold;
+  font-weight: 300;
  text-align: center;
-  padding-bottom: 1.5em;
+  padding-bottom: 2.5em;
 }

-.screen-shield-clock-time {
-  font-size: 72pt;
-  text-shadow: $_screenshield_shadow;
+.unlock-dialog-clock-time {
+  font-size: 64pt;
+  padding-bottom: 24px;
  font-feature-settings: "tnum";
 }

-.screen-shield-clock-date { 
-  font-size: 28pt;
+.unlock-dialog-clock-date {
+  font-size: 16pt;
  font-weight: normal;
 }

-.screen-shield-notifications-container {
+.unlock-dialog-notifications-container {
+  margin: 12px 0;
  spacing: 6px;
-  width: 30em;
+  width: 23em;
  background-color: transparent;
-  max-height: 500px;
  .summary-notification-stack-scrollview {
    padding-top: 0;
    padding-bottom: 0;
  }

  .notification,
-  .screen-shield-notification-source {
+  .unlock-dialog-notification-source {
    padding: 12px 6px;
    border: 1px solid $osd_outer_borders_color;
    background-color: transparentize($osd_bg_color,0.5);
    color: $osd_fg_color;
    border-radius: 4px;
+
+    &.critical { background-color: transparentize($osd_bg_color,0.1) }
  }
-  .notification { margin-right: 15px; } //compensate for space allocated to the scrollbar
 }

-
-.screen-shield-notification-label {
-  font-weight: bold;
+.unlock-dialog-notification-label {
  padding: 0px 0px 0px 12px;
 }

-.screen-shield-notification-count-text { padding: 0px 0px 0px 12px; }
-
-#panel.lock-screen { background-color: transparentize($osd_bg_color, 0.5); }
+.unlock-dialog-notification-count-text {
+  weight: bold;
+  padding: 0px 12px;
+}

 .screen-shield-background { //just the shadow, really
  background: black;
@@ -70,11 +55,10 @@ $_screenshield_shadow: 0px 0px 6px rgba(0, 0, 0, 0.726);
 }

 #lockDialogGroup {
-  background: lighten(#2e3436, 8%) url(resource:///org/gnome/shell/theme/noise-texture.png);
-  background-repeat: repeat;
+  background-color: lighten(#2e3436, 8%);
 }

-#screenShieldNotifications {
+#unlockDialogNotifications {
  StButton#vhandle, StButton#hhandle {
    background-color: transparentize($bg_color,0.7);
    &:hover, &:focus { background-color: transparentize($bg_color,0.5); }
--- a/data/theme/noise-texture.png
+++ b/data/theme/noise-texture.png
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -409,7 +409,10 @@ var SessionMenuButton = GObject.registerClass({
 });

 var LoginDialog = GObject.registerClass({
-    Signals: { 'failed': {} },
+    Signals: {
+        'failed': {},
+        'wake-up-screen': {},
+    },
 }, class LoginDialog extends St.Widget {
    _init(parentActor) {
        super._init({ style_class: 'login-dialog', visible: false });
@@ -1225,13 +1228,18 @@ var LoginDialog = GObject.registerClass({
        return GLib.SOURCE_REMOVE;
    }

+    activate() {
+        this._userList.grab_key_focus();
+        this.show();
+    }
+
    open() {
        Main.ctrlAltTabManager.addGroup(this,
                                        _("Login Window"),
                                        'dialog-password-symbolic',
                                        { sortGroup: CtrlAltTab.SortGroup.MIDDLE });
-        this._userList.grab_key_focus();
-        this.show();
+        this.activate();
+
        this.opacity = 0;

        Main.pushModal(this, { actionMode: Shell.ActionMode.LOGIN_SCREEN });
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -1525,10 +1525,10 @@ var FolderIcon = GObject.registerClass({
    }

    vfunc_unmap() {
-        super.vfunc_unmap();
-
        if (this._dialog)
            this._dialog.popdown();
+
+        super.vfunc_unmap();
    }

    open() {
--- a/js/ui/background.js
+++ b/js/ui/background.js
@@ -504,12 +504,9 @@ var SystemBackground = GObject.registerClass({
    Signals: { 'loaded': {} },
 }, class SystemBackground extends Meta.BackgroundActor {
    _init() {
-        let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/noise-texture.png');
-
        if (_systemBackground == null) {
            _systemBackground = new Meta.Background({ meta_display: global.display });
            _systemBackground.set_color(DEFAULT_BACKGROUND_COLOR);
-            _systemBackground.set_file(file, GDesktopEnums.BackgroundStyle.WALLPAPER);
        }

        super._init({
@@ -518,22 +515,11 @@ var SystemBackground = GObject.registerClass({
            background: _systemBackground,
        });

-        let cache = Meta.BackgroundImageCache.get_default();
-        let image = cache.load(file);
-        if (image.is_loaded()) {
-            image = null;
-            let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
-                this.emit('loaded');
-                return GLib.SOURCE_REMOVE;
-            });
-            GLib.Source.set_name_by_id(id, '[gnome-shell] SystemBackground.loaded');
-        } else {
-            let id = image.connect('loaded', () => {
-                this.emit('loaded');
-                image.disconnect(id);
-                image = null;
-            });
-        }
+        let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
+            this.emit('loaded');
+            return GLib.SOURCE_REMOVE;
+        });
+        GLib.Source.set_name_by_id(id, '[gnome-shell] SystemBackground.loaded');
    }
 });

--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@@ -411,14 +411,18 @@ var _Draggable = class _Draggable {
        this._snapBackY = this._dragStartY + this._dragOffsetY;
        this._snapBackScale = this._dragActor.scale_x;

+        let origDragOffsetX = this._dragOffsetX;
+        let origDragOffsetY = this._dragOffsetY;
+        let [transX, transY] = this._dragActor.get_translation();
+        this._dragOffsetX -= transX;
+        this._dragOffsetY -= transY;
+
        if (this._dragActorMaxSize != undefined) {
            let [scaledWidth, scaledHeight] = this._dragActor.get_transformed_size();
            let currentSize = Math.max(scaledWidth, scaledHeight);
            if (currentSize > this._dragActorMaxSize) {
                let scale = this._dragActorMaxSize / currentSize;
                let origScale =  this._dragActor.scale_x;
-                let origDragOffsetX = this._dragOffsetX;
-                let origDragOffsetY = this._dragOffsetY;

                // The position of the actor changes as we scale
                // around the drag position, but we can't just tween
@@ -435,8 +439,8 @@ var _Draggable = class _Draggable {

                this._dragActor.get_transition('scale-x').connect('new-frame', () => {
                    let currentScale = this._dragActor.scale_x / origScale;
-                    this._dragOffsetX = currentScale * origDragOffsetX;
-                    this._dragOffsetY = currentScale * origDragOffsetY;
+                    this._dragOffsetX = currentScale * origDragOffsetX - transX;
+                    this._dragOffsetY = currentScale * origDragOffsetY - transY;
                    this._dragActor.set_position(
                        this._dragX + this._dragOffsetX,
                        this._dragY + this._dragOffsetY);
--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@@ -195,7 +195,7 @@ function zoomOutActorAtPos(actor, x, y) {
 }

 function animateIconPosition(icon, box, flags, nChangedIcons) {
-    if (!icon.has_allocation() || icon.allocation.equal(box)) {
+    if (!icon.has_allocation() || icon.allocation.equal(box) || icon.opacity === 0) {
        icon.allocate(box, flags);
        return false;
    }
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -1102,6 +1102,9 @@ var KeyboardManager = class KeyBoardManager {
        this._a11yApplicationsSettings = new Gio.Settings({ schema_id: A11Y_APPLICATIONS_SCHEMA });
        this._a11yApplicationsSettings.connect('changed', this._syncEnabled.bind(this));

+        this._seat = Clutter.get_default_backend().get_default_seat();
+        this._seat.connect('notify::touch-mode', this._syncEnabled.bind(this));
+
        this._lastDevice = null;
        Meta.get_backend().connect('last-device-changed', (backend, device) => {
            if (device.get_device_name().indexOf('XTEST') < 0) {
@@ -1122,7 +1125,9 @@ var KeyboardManager = class KeyBoardManager {

    _syncEnabled() {
        let enableKeyboard = this._a11yApplicationsSettings.get_boolean(SHOW_KEYBOARD);
-        let enabled = enableKeyboard || this._lastDeviceIsTouchscreen();
+        let autoEnabled = this._seat.get_touch_mode() && this._lastDeviceIsTouchscreen();
+        let enabled = enableKeyboard || autoEnabled;
+
        if (!enabled && !this._keyboard)
            return;

--- a/js/ui/magnifier.js
+++ b/js/ui/magnifier.js
@@ -430,8 +430,10 @@ var Magnifier = class Magnifier {
     *     lines making up the crosshairs.
     */
    setCrosshairsLength(length) {
-        if (this._crossHairs)
-            this._crossHairs.setLength(length);
+        if (this._crossHairs) {
+            let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
+            this._crossHairs.setLength(length / scaleFactor);
+        }
    }

    /**
@@ -797,9 +799,14 @@ var ZoomRegion = class ZoomRegion {
            return;
        }

-        [this._xFocus, this._yFocus] = [extents.x + (extents.width / 2),
-                                        extents.y + (extents.height / 2)];
-        this._centerFromFocusPosition();
+        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
+        let [xFocus, yFocus] = [(extents.x + (extents.width / 2)) * scaleFactor,
+                                (extents.y + (extents.height / 2)) * scaleFactor];
+
+        if (this._xFocus !== xFocus || this._yFocus !== yFocus) {
+            [this._xFocus, this._yFocus] = [xFocus, yFocus];
+            this._centerFromFocusPosition();
+        }
    }

    _updateCaret(caller, event) {
@@ -814,8 +821,13 @@ var ZoomRegion = class ZoomRegion {
            return;
        }

-        [this._xCaret, this._yCaret] = [extents.x, extents.y];
-        this._centerFromCaretPosition();
+        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
+        let [xCaret, yCaret] = [extents.x * scaleFactor, extents.y * scaleFactor];
+
+        if (this._xCaret !== xCaret || this._yCaret !== yCaret) {
+            [this._xCaret, this._yCaret] = [xCaret, yCaret];
+            this._centerFromCaretPosition();
+        }
    }

    /**
@@ -863,7 +875,8 @@ var ZoomRegion = class ZoomRegion {
    setMagFactor(xMagFactor, yMagFactor) {
        this._changeROI({ xMagFactor,
                          yMagFactor,
-                          redoCursorTracking: this._followingCursor });
+                          redoCursorTracking: this._followingCursor,
+                          animate: true });
    }

    /**
@@ -1121,6 +1134,13 @@ var ZoomRegion = class ZoomRegion {
        return this._screenPosition;
    }

+    _clearScrollContentsTimer() {
+        if (this._scrollContentsTimerId !== 0) {
+            GLib.source_remove(this._scrollContentsTimerId);
+            this._scrollContentsTimerId = 0;
+        }
+    }
+
    /**
     * scrollToMousePos:
     * Set the region of interest based on the position of the system pointer.
@@ -1134,28 +1154,29 @@ var ZoomRegion = class ZoomRegion {
        else
            this._updateMousePosition();

+        this._clearScrollContentsTimer();
+        this._scrollContentsTimerId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, POINTER_REST_TIME, () => {
+            this._followingCursor = false;
+            if (this._xDelayed !== null && this._yDelayed !== null) {
+                this._scrollContentsToDelayed(this._xDelayed, this._yDelayed);
+                this._xDelayed = null;
+                this._yDelayed = null;
+            }
+
+            return GLib.SOURCE_REMOVE;
+        });
+
        // Determine whether the system mouse pointer is over this zoom region.
        return this._isMouseOverRegion();
    }

-    _clearScrollContentsTimer() {
-        if (this._scrollContentsTimerId != 0) {
-            GLib.source_remove(this._scrollContentsTimerId);
-            this._scrollContentsTimerId = 0;
-        }
-    }
-
    _scrollContentsToDelayed(x, y) {
-        if (this._pointerIdleMonitor.get_idletime() >= POINTER_REST_TIME) {
+        if (this._followingCursor) {
+            this._xDelayed = x;
+            this._yDelayed = y;
+        } else {
            this.scrollContentsTo(x, y);
-            return;
        }
-
-        this._clearScrollContentsTimer();
-        this._scrollContentsTimerId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, POINTER_REST_TIME, () => {
-            this._scrollContentsToDelayed(x, y);
-            return GLib.SOURCE_REMOVE;
-        });
    }

    /**
@@ -1166,11 +1187,16 @@ var ZoomRegion = class ZoomRegion {
     * @param {number} y: The y-coord of the point to center on.
     */
    scrollContentsTo(x, y) {
+        if (x < 0 || x > global.screen_width ||
+            y < 0 || y > global.screen_height)
+            return;
+
        this._clearScrollContentsTimer();

        this._followingCursor = false;
        this._changeROI({ xCenter: x,
-                          yCenter: y });
+                          yCenter: y,
+                          animate: true });
    }

    /**
@@ -1322,7 +1348,7 @@ var ZoomRegion = class ZoomRegion {
            this._crossHairsActor = null;

        // Contrast and brightness effects.
-        this._magShaderEffects = new MagShaderEffects(this._uiGroupClone);
+        this._magShaderEffects = new MagShaderEffects(mainGroup);
        this._magShaderEffects.setColorSaturation(this._colorSaturation);
        this._magShaderEffects.setInvertLightness(this._invertLightness);
        this._magShaderEffects.setBrightness(this._brightness);
@@ -1379,7 +1405,8 @@ var ZoomRegion = class ZoomRegion {
                                        yMagFactor: this._yMagFactor,
                                        xCenter: this._xCenter,
                                        yCenter: this._yCenter,
-                                        redoCursorTracking: false });
+                                        redoCursorTracking: false,
+                                        animate: false });

        if (params.xMagFactor <= 0)
            params.xMagFactor = this._xMagFactor;
@@ -1418,8 +1445,7 @@ var ZoomRegion = class ZoomRegion {
                                height: this._viewPortHeight }, true);
        }

-        this._updateCloneGeometry();
-        this._updateMousePosition();
+        this._updateCloneGeometry(params.animate);
    }

    _isMouseOverRegion() {
@@ -1557,38 +1583,64 @@ var ZoomRegion = class ZoomRegion {
        this._magView.set_position(this._viewPortX, this._viewPortY);
    }

-    _updateCloneGeometry() {
+    _updateCloneGeometry(animate = false) {
        if (!this.isActive())
            return;

-        this._uiGroupClone.set_scale(this._xMagFactor, this._yMagFactor);
-        this._mouseActor.set_scale(this._xMagFactor, this._yMagFactor);
-
        let [x, y] = this._screenToViewPort(0, 0);
-        this._uiGroupClone.set_position(Math.round(x), Math.round(y));
+        this._uiGroupClone.ease({
+            x: Math.round(x),
+            y: Math.round(y),
+            scale_x: this._xMagFactor,
+            scale_y: this._yMagFactor,
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+            duration: animate ? 100 : 0,
+        });

-        this._updateMousePosition();
+        let [mouseX, mouseY] = this._getMousePosition();
+        this._mouseActor.ease({
+            x: mouseX,
+            y: mouseY,
+            scale_x: this._xMagFactor,
+            scale_y: this._yMagFactor,
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+            duration: animate ? 100 : 0,
+        });
+
+        if (this._crossHairsActor) {
+            let [crossX, crossY] = this._getCrossHairsPosition();
+            this._crossHairsActor.ease({
+                x: crossX,
+                y: crossY,
+                mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+                duration: animate ? 100 : 0,
+            });
+        }
    }

    _updateMousePosition() {
-        if (!this.isActive())
-            return;
-
-        let [xMagMouse, yMagMouse] = this._screenToViewPort(this._magnifier.xMouse,
-                                                            this._magnifier.yMouse);
-
-        xMagMouse = Math.round(xMagMouse);
-        yMagMouse = Math.round(yMagMouse);
-
+        let [xMagMouse, yMagMouse] = this._getMousePosition();
        this._mouseActor.set_position(xMagMouse, yMagMouse);

        if (this._crossHairsActor) {
-            let [groupWidth, groupHeight] = this._crossHairsActor.get_size();
-            this._crossHairsActor.set_position(xMagMouse - groupWidth / 2,
-                                               yMagMouse - groupHeight / 2);
+            let [crossX, crossY] = this._getCrossHairsPosition();
+            this._crossHairsActor.set_position(crossX, crossY);
        }
    }

+    _getMousePosition() {
+        let [xMagMouse, yMagMouse] = this._screenToViewPort(
+            this._magnifier.xMouse, this._magnifier.yMouse);
+        return [Math.round(xMagMouse), Math.round(yMagMouse)];
+    }
+
+    _getCrossHairsPosition() {
+        let [xMagMouse, yMagMouse] = this._getMousePosition();
+        let [groupWidth, groupHeight] = this._crossHairsActor.get_size();
+
+        return [xMagMouse - groupWidth / 2, yMagMouse - groupHeight / 2];
+    }
+
    _monitorsChanged() {
        this._background.set_size(global.screen_width, global.screen_height);
        this._updateScreenPosition();
@@ -1807,12 +1859,10 @@ class Crosshairs extends Clutter.Actor {
        let clipWidth = this._clipSize[0];
        let clipHeight = this._clipSize[1];

-        // Note that clip, if present, is not centred on the cross hair
-        // intersection, but biased towards the top left.
-        let left = groupWidth / 2 - clipWidth * 0.25 - leftLength;
-        let right = groupWidth / 2 + clipWidth * 0.75;
-        let top = groupHeight / 2 - clipHeight * 0.25 - topLength - thickness / 2;
-        let bottom = groupHeight / 2 + clipHeight * 0.75 + thickness / 2;
+        let left = groupWidth / 2 - clipWidth / 2 - leftLength - thickness / 2;
+        let right = groupWidth / 2 + clipWidth / 2 + thickness / 2;
+        let top = groupHeight / 2 - clipHeight / 2 - topLength - thickness / 2;
+        let bottom = groupHeight / 2 + clipHeight / 2 + thickness / 2;
        this._horizLeftHair.set_position(left, (groupHeight - thickness) / 2);
        this._horizRightHair.set_position(right, (groupHeight - thickness) / 2);
        this._vertTopHair.set_position((groupWidth - thickness) / 2, top);
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -1,13 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

-const { AccountsService, Clutter, Gio, GLib,
-        GnomeDesktop, GObject, Graphene, Meta, Shell, St } = imports.gi;
-const Cairo = imports.cairo;
+const { AccountsService, Clutter, Gio,
+        GLib, Graphene, Meta, Shell, St } = imports.gi;
 const Signals = imports.signals;

-const Background = imports.ui.background;
 const GnomeSession = imports.misc.gnomeSession;
-const Layout = imports.ui.layout;
 const OVirt = imports.gdm.oVirt;
 const LoginManager = imports.misc.loginManager;
 const Lightbox = imports.ui.lightbox;
@@ -27,17 +24,6 @@ const LOCKDOWN_SCHEMA = 'org.gnome.desktop.lockdown';
 const DISABLE_LOCK_KEY = 'disable-lock-screen';

 const LOCKED_STATE_STR = 'screenShield.locked';
-// fraction of screen height the arrow must reach before completing
-// the slide up automatically
-var ARROW_DRAG_THRESHOLD = 0.1;
-
-// Parameters for the arrow animation
-var N_ARROWS = 3;
-var ARROW_ANIMATION_TIME = 600;
-var ARROW_ANIMATION_PEAK_OPACITY = 0.4;
-var ARROW_IDLE_TIME = 30000; // ms
-
-var SUMMARY_ICON_SIZE = 48;

 // ScreenShield animation time
 // - STANDARD_FADE_TIME is used when the session goes idle
@@ -48,384 +34,6 @@ var STANDARD_FADE_TIME = 10000;
 var MANUAL_FADE_TIME = 300;
 var CURTAIN_SLIDE_TIME = 300;

-var Clock = GObject.registerClass(
-class ScreenShieldClock extends St.BoxLayout {
-    _init() {
-        super._init({ style_class: 'screen-shield-clock', vertical: true });
-
-        this._time = new St.Label({
-            style_class: 'screen-shield-clock-time',
-            x_align: Clutter.ActorAlign.CENTER,
-        });
-        this._date = new St.Label({
-            style_class: 'screen-shield-clock-date',
-            x_align: Clutter.ActorAlign.CENTER,
-        });
-
-        this.add_child(this._time);
-        this.add_child(this._date);
-
-        this._wallClock = new GnomeDesktop.WallClock({ time_only: true });
-        this._wallClock.connect('notify::clock', this._updateClock.bind(this));
-
-        this._updateClock();
-
-        this.connect('destroy', this._onDestroy.bind(this));
-    }
-
-    _updateClock() {
-        this._time.text = this._wallClock.clock;
-
-        let date = new Date();
-        /* Translators: This is a time format for a date in
-           long format */
-        let dateFormat = Shell.util_translate_time_string(N_("%A, %B %d"));
-        this._date.text = date.toLocaleFormat(dateFormat);
-    }
-
-    _onDestroy() {
-        this._wallClock.run_dispose();
-    }
-});
-
-var NotificationsBox = GObject.registerClass({
-    Signals: { 'wake-up-screen': {} },
-}, class NotificationsBox extends St.BoxLayout {
-    _init() {
-        super._init({
-            vertical: true,
-            name: 'screenShieldNotifications',
-            style_class: 'screen-shield-notifications-container',
-        });
-
-        this._scrollView = new St.ScrollView({ hscrollbar_policy: St.PolicyType.NEVER });
-        this._notificationBox = new St.BoxLayout({ vertical: true,
-                                                   style_class: 'screen-shield-notifications-container' });
-        this._scrollView.add_actor(this._notificationBox);
-
-        this.add_child(this._scrollView);
-
-        this._sources = new Map();
-        Main.messageTray.getSources().forEach(source => {
-            this._sourceAdded(Main.messageTray, source, true);
-        });
-        this._updateVisibility();
-
-        this._sourceAddedId = Main.messageTray.connect('source-added', this._sourceAdded.bind(this));
-
-        this.connect('destroy', this._onDestroy.bind(this));
-    }
-
-    _onDestroy() {
-        if (this._sourceAddedId) {
-            Main.messageTray.disconnect(this._sourceAddedId);
-            this._sourceAddedId = 0;
-        }
-
-        let items = this._sources.entries();
-        for (let [source, obj] of items)
-            this._removeSource(source, obj);
-    }
-
-    _updateVisibility() {
-        this._notificationBox.visible =
-            this._notificationBox.get_children().some(a => a.visible);
-
-        this.visible = this._notificationBox.visible;
-    }
-
-    _makeNotificationCountText(count, isChat) {
-        if (isChat)
-            return ngettext("%d new message", "%d new messages", count).format(count);
-        else
-            return ngettext("%d new notification", "%d new notifications", count).format(count);
-    }
-
-    _makeNotificationSource(source, box) {
-        let sourceActor = new MessageTray.SourceActor(source, SUMMARY_ICON_SIZE);
-        box.add_child(sourceActor);
-
-        let textBox = new St.BoxLayout({ vertical: true });
-        box.add_child(textBox);
-
-        let title = new St.Label({ text: source.title,
-                                   style_class: 'screen-shield-notification-label' });
-        textBox.add(title);
-
-        let count = source.unseenCount;
-        let countLabel = new St.Label({ text: this._makeNotificationCountText(count, source.isChat),
-                                        style_class: 'screen-shield-notification-count-text' });
-        textBox.add(countLabel);
-
-        box.visible = count != 0;
-        return [title, countLabel];
-    }
-
-    _makeNotificationDetailedSource(source, box) {
-        let sourceActor = new MessageTray.SourceActor(source, SUMMARY_ICON_SIZE);
-        let sourceBin = new St.Bin({ child: sourceActor });
-        box.add(sourceBin);
-
-        let textBox = new St.BoxLayout({ vertical: true });
-        box.add_child(textBox);
-
-        let title = new St.Label({ text: source.title,
-                                   style_class: 'screen-shield-notification-label' });
-        textBox.add(title);
-
-        let visible = false;
-        for (let i = 0; i < source.notifications.length; i++) {
-            let n = source.notifications[i];
-
-            if (n.acknowledged)
-                continue;
-
-            let body = '';
-            if (n.bannerBodyText) {
-                body = n.bannerBodyMarkup
-                    ? n.bannerBodyText
-                    : GLib.markup_escape_text(n.bannerBodyText, -1);
-            }
-
-            let label = new St.Label({ style_class: 'screen-shield-notification-count-text' });
-            label.clutter_text.set_markup(`<b>${n.title}</b> ${body}`);
-            textBox.add(label);
-
-            visible = true;
-        }
-
-        box.visible = visible;
-        return [title, null];
-    }
-
-    _shouldShowDetails(source) {
-        return source.policy.detailsInLockScreen ||
-               source.narrowestPrivacyScope == MessageTray.PrivacyScope.SYSTEM;
-    }
-
-    _showSource(source, obj, box) {
-        if (obj.detailed)
-            [obj.titleLabel, obj.countLabel] = this._makeNotificationDetailedSource(source, box);
-        else
-            [obj.titleLabel, obj.countLabel] = this._makeNotificationSource(source, box);
-
-        box.visible = obj.visible && (source.unseenCount > 0);
-    }
-
-    _sourceAdded(tray, source, initial) {
-        let obj = {
-            visible: source.policy.showInLockScreen,
-            detailed: this._shouldShowDetails(source),
-            sourceDestroyId: 0,
-            sourceCountChangedId: 0,
-            sourceTitleChangedId: 0,
-            sourceUpdatedId: 0,
-            sourceBox: null,
-            titleLabel: null,
-            countLabel: null,
-        };
-
-        obj.sourceBox = new St.BoxLayout({ style_class: 'screen-shield-notification-source',
-                                           x_expand: true });
-        this._showSource(source, obj, obj.sourceBox);
-        this._notificationBox.add_child(obj.sourceBox);
-
-        obj.sourceCountChangedId = source.connect('notify::count', () => {
-            this._countChanged(source, obj);
-        });
-        obj.sourceTitleChangedId = source.connect('notify::title', () => {
-            this._titleChanged(source, obj);
-        });
-        obj.policyChangedId = source.policy.connect('notify', (policy, pspec) => {
-            if (pspec.name == 'show-in-lock-screen')
-                this._visibleChanged(source, obj);
-            else
-                this._detailedChanged(source, obj);
-        });
-        obj.sourceDestroyId = source.connect('destroy', () => {
-            this._onSourceDestroy(source, obj);
-        });
-
-        this._sources.set(source, obj);
-
-        if (!initial) {
-            // block scrollbars while animating, if they're not needed now
-            let boxHeight = this._notificationBox.height;
-            if (this._scrollView.height >= boxHeight)
-                this._scrollView.vscrollbar_policy = St.PolicyType.NEVER;
-
-            let widget = obj.sourceBox;
-            let [, natHeight] = widget.get_preferred_height(-1);
-            widget.height = 0;
-            widget.ease({
-                height: natHeight,
-                mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-                duration: 250,
-                onComplete: () => {
-                    this._scrollView.vscrollbar_policy = St.PolicyType.AUTOMATIC;
-                    widget.set_height(-1);
-                },
-            });
-
-            this._updateVisibility();
-            if (obj.sourceBox.visible)
-                this.emit('wake-up-screen');
-        }
-    }
-
-    _titleChanged(source, obj) {
-        obj.titleLabel.text = source.title;
-    }
-
-    _countChanged(source, obj) {
-        // A change in the number of notifications may change whether we show
-        // details.
-        let newDetailed = this._shouldShowDetails(source);
-        let oldDetailed = obj.detailed;
-
-        obj.detailed = newDetailed;
-
-        if (obj.detailed || oldDetailed != newDetailed) {
-            // A new notification was pushed, or a previous notification was destroyed.
-            // Give up, and build the list again.
-
-            obj.sourceBox.destroy_all_children();
-            obj.titleLabel = obj.countLabel = null;
-            this._showSource(source, obj, obj.sourceBox);
-        } else {
-            let count = source.unseenCount;
-            obj.countLabel.text = this._makeNotificationCountText(count, source.isChat);
-        }
-
-        obj.sourceBox.visible = obj.visible && (source.unseenCount > 0);
-
-        this._updateVisibility();
-        if (obj.sourceBox.visible)
-            this.emit('wake-up-screen');
-    }
-
-    _visibleChanged(source, obj) {
-        if (obj.visible == source.policy.showInLockScreen)
-            return;
-
-        obj.visible = source.policy.showInLockScreen;
-        obj.sourceBox.visible = obj.visible && source.unseenCount > 0;
-
-        this._updateVisibility();
-        if (obj.sourceBox.visible)
-            this.emit('wake-up-screen');
-    }
-
-    _detailedChanged(source, obj) {
-        let newDetailed = this._shouldShowDetails(source);
-        if (obj.detailed == newDetailed)
-            return;
-
-        obj.detailed = newDetailed;
-
-        obj.sourceBox.destroy_all_children();
-        obj.titleLabel = obj.countLabel = null;
-        this._showSource(source, obj, obj.sourceBox);
-    }
-
-    _onSourceDestroy(source, obj) {
-        this._removeSource(source, obj);
-        this._updateVisibility();
-    }
-
-    _removeSource(source, obj) {
-        obj.sourceBox.destroy();
-        obj.sourceBox = obj.titleLabel = obj.countLabel = null;
-
-        source.disconnect(obj.sourceDestroyId);
-        source.disconnect(obj.sourceCountChangedId);
-        source.disconnect(obj.sourceTitleChangedId);
-        source.policy.disconnect(obj.policyChangedId);
-
-        this._sources.delete(source);
-    }
-});
-
-var Arrow = GObject.registerClass(
-class ScreenShieldArrow extends St.Bin {
-    _init(params) {
-        super._init(params);
-
-        this._drawingArea = new St.DrawingArea({
-            x_expand: true,
-            y_expand: true,
-        });
-        this._drawingArea.connect('repaint', this._drawArrow.bind(this));
-        this.child = this._drawingArea;
-
-        this._shadowHelper = null;
-        this._shadowWidth = this._shadowHeight = 0;
-    }
-
-    _drawArrow(arrow) {
-        let cr = arrow.get_context();
-        let [w, h] = arrow.get_surface_size();
-        let node = this.get_theme_node();
-        let thickness = node.get_length('-arrow-thickness');
-
-        Clutter.cairo_set_source_color(cr, node.get_foreground_color());
-
-        cr.setLineCap(Cairo.LineCap.ROUND);
-        cr.setLineWidth(thickness);
-
-        cr.moveTo(thickness / 2, h - thickness / 2);
-        cr.lineTo(w / 2, thickness);
-        cr.lineTo(w - thickness / 2, h - thickness / 2);
-        cr.stroke();
-        cr.$dispose();
-    }
-
-    vfunc_get_paint_volume(volume) {
-        if (!super.vfunc_get_paint_volume(volume))
-            return false;
-
-        if (!this._shadow)
-            return true;
-
-        let shadowBox = new Clutter.ActorBox();
-        this._shadow.get_box(this._drawingArea.get_allocation_box(), shadowBox);
-
-        volume.set_width(Math.max(shadowBox.x2 - shadowBox.x1, volume.get_width()));
-        volume.set_height(Math.max(shadowBox.y2 - shadowBox.y1, volume.get_height()));
-
-        return true;
-    }
-
-    vfunc_style_changed() {
-        let node = this.get_theme_node();
-        this._shadow = node.get_shadow('-arrow-shadow');
-        if (this._shadow)
-            this._shadowHelper = St.ShadowHelper.new(this._shadow);
-        else
-            this._shadowHelper = null;
-
-        super.vfunc_style_changed();
-    }
-
-    vfunc_paint(paintContext) {
-        if (this._shadowHelper) {
-            this._shadowHelper.update(this._drawingArea);
-
-            let allocation = this._drawingArea.get_allocation_box();
-            let paintOpacity = this._drawingArea.get_paint_opacity();
-            let framebuffer = paintContext.get_framebuffer();
-
-            this._shadowHelper.paint(framebuffer, allocation, paintOpacity);
-        }
-
-        this._drawingArea.paint(paintContext);
-    }
-});
-
-function clamp(value, min, max) {
-    return Math.max(min, Math.min(max, value));
-}
-
 /**
 * If you are setting org.gnome.desktop.session.idle-delay directly in dconf,
 * rather than through System Settings, you also need to set
@@ -447,59 +55,18 @@ var ScreenShield = class {
            name: 'lockScreenGroup',
            visible: false,
        });
-        this._lockScreenGroup.connect('key-press-event',
-                                      this._onLockScreenKeyPress.bind(this));
-        this._lockScreenGroup.connect('scroll-event',
-                                      this._onLockScreenScroll.bind(this));
-        Main.ctrlAltTabManager.addGroup(this._lockScreenGroup, _("Lock"), 'changes-prevent-symbolic');

-        this._lockScreenContents = new St.Widget({ layout_manager: new Clutter.BinLayout(),
-                                                   name: 'lockScreenContents' });
-        this._lockScreenContents.add_constraint(new Layout.MonitorConstraint({ primary: true }));
+        this._lockDialogGroup = new St.Widget({
+            x_expand: true,
+            y_expand: true,
+            reactive: true,
+            can_focus: true,
+            pivot_point: new Graphene.Point({ x: 0.5, y: 0.5 }),
+            name: 'lockDialogGroup',
+        });

-        this._lockScreenGroup.add_actor(this._lockScreenContents);
-
-        this._backgroundGroup = new Clutter.Actor();
-
-        this._lockScreenGroup.add_actor(this._backgroundGroup);
-        this._lockScreenGroup.set_child_below_sibling(this._backgroundGroup, null);
-        this._bgManagers = [];
-
-        this._updateBackgrounds();
-        Main.layoutManager.connect('monitors-changed', this._updateBackgrounds.bind(this));
-
-        this._arrowAnimationId = 0;
-        this._arrowWatchId = 0;
-        this._arrowActiveWatchId = 0;
-        this._arrowContainer = new St.BoxLayout({ style_class: 'screen-shield-arrows',
-                                                  vertical: true,
-                                                  x_align: Clutter.ActorAlign.CENTER,
-                                                  y_align: Clutter.ActorAlign.END,
-                                                  // HACK: without these, ClutterBinLayout
-                                                  // ignores alignment properties on the actor
-                                                  x_expand: true,
-                                                  y_expand: true });
-
-        for (let i = 0; i < N_ARROWS; i++) {
-            let arrow = new Arrow({ opacity: 0 });
-            this._arrowContainer.add_actor(arrow);
-        }
-        this._lockScreenContents.add_actor(this._arrowContainer);
-
-        this._dragAction = new Clutter.GestureAction();
-        this._dragAction.connect('gesture-begin', this._onDragBegin.bind(this));
-        this._dragAction.connect('gesture-progress', this._onDragMotion.bind(this));
-        this._dragAction.connect('gesture-end', this._onDragEnd.bind(this));
-        this._lockScreenGroup.add_action(this._dragAction);
-
-        this._lockDialogGroup = new St.Widget({ x_expand: true,
-                                                y_expand: true,
-                                                reactive: true,
-                                                pivot_point: new Graphene.Point({ x: 0.5, y: 0.5 }),
-                                                name: 'lockDialogGroup' });
-
-        this.actor.add_actor(this._lockDialogGroup);
        this.actor.add_actor(this._lockScreenGroup);
+        this.actor.add_actor(this._lockDialogGroup);

        this._presence = new GnomeSession.Presence((proxy, error) => {
            if (error) {
@@ -519,14 +86,14 @@ var ScreenShield = class {
        this._smartcardManager.connect('smartcard-inserted',
                                       (manager, token) => {
                                           if (this._isLocked && token.UsedToLogin)
-                                               this._liftShield(true, 0);
+                                               this._activateDialog();
                                       });

        this._oVirtCredentialsManager = OVirt.getOVirtCredentialsManager();
        this._oVirtCredentialsManager.connect('user-authenticated',
                                              () => {
                                                  if (this._isLocked)
-                                                      this._liftShield(true, 0);
+                                                      this._activateDialog();
                                              });

        this._loginManager = LoginManager.getLoginManager();
@@ -551,7 +118,6 @@ var ScreenShield = class {
        this._lockSettings.connect(`changed::${DISABLE_LOCK_KEY}`, this._syncInhibitor.bind(this));

        this._isModal = false;
-        this._hasLockScreen = false;
        this._isGreeter = false;
        this._isActive = false;
        this._isLocked = false;
@@ -591,39 +157,10 @@ var ScreenShield = class {
        this._syncInhibitor();
    }

-    _createBackground(monitorIndex) {
-        let monitor = Main.layoutManager.monitors[monitorIndex];
-        let widget = new St.Widget({ style_class: 'screen-shield-background',
-                                     x: monitor.x,
-                                     y: monitor.y,
-                                     width: monitor.width,
-                                     height: monitor.height });
-
-        let bgManager = new Background.BackgroundManager({ container: widget,
-                                                           monitorIndex,
-                                                           controlPosition: false,
-                                                           settingsSchema: SCREENSAVER_SCHEMA });
-
-        this._bgManagers.push(bgManager);
-
-        this._backgroundGroup.add_child(widget);
-    }
-
-    _updateBackgrounds() {
-        for (let i = 0; i < this._bgManagers.length; i++)
-            this._bgManagers[i].destroy();
-
-        this._bgManagers = [];
-        this._backgroundGroup.destroy_all_children();
-
-        for (let i = 0; i < Main.layoutManager.monitors.length; i++)
-            this._createBackground(i);
-    }
-
-    _liftShield(onPrimary, velocity) {
+    _activateDialog() {
        if (this._isLocked) {
-            if (this._ensureUnlockDialog(onPrimary, true /* allowCancel */))
-                this._hideLockScreen(true /* animate */, velocity);
+            this._ensureUnlockDialog(true /* allowCancel */);
+            this._dialog.activate();
        } else {
            this.deactivate(true /* animate */);
        }
@@ -638,9 +175,7 @@ var ScreenShield = class {
            // LoginDialog.cancel() will grab the key focus
            // on its own, so ensure it stays on lock screen
            // instead
-            this._lockScreenGroup.grab_key_focus();
-        } else {
-            this._dialog = null;
+            this._dialog.grab_key_focus();
        }
    }

@@ -659,55 +194,6 @@ var ScreenShield = class {
        return this._isModal;
    }

-    _onLockScreenKeyPress(actor, event) {
-        let symbol = event.get_key_symbol();
-        let unichar = event.get_key_unicode();
-
-        // Do nothing if the lock screen is not fully shown.
-        // This avoids reusing the previous (and stale) unlock
-        // dialog if esc is pressed while the curtain is going
-        // down after cancel.
-
-        if (this._lockScreenState != MessageTray.State.SHOWN)
-            return Clutter.EVENT_PROPAGATE;
-
-        let isEnter = symbol == Clutter.KEY_Return ||
-                       symbol == Clutter.KEY_KP_Enter ||
-                       symbol == Clutter.KEY_ISO_Enter;
-        let isEscape = symbol == Clutter.KEY_Escape;
-        let isLiftChar = GLib.unichar_isprint(unichar) &&
-                          (this._isLocked || !GLib.unichar_isgraph(unichar));
-        if (!isEnter && !isEscape && !isLiftChar)
-            return Clutter.EVENT_PROPAGATE;
-
-        if (this._isLocked &&
-            this._ensureUnlockDialog(true, true) &&
-            GLib.unichar_isgraph(unichar))
-            this._dialog.addCharacter(unichar);
-
-        this._liftShield(true, 0);
-        return Clutter.EVENT_STOP;
-    }
-
-    _onLockScreenScroll(actor, event) {
-        if (this._lockScreenState != MessageTray.State.SHOWN)
-            return Clutter.EVENT_PROPAGATE;
-
-        let delta = 0;
-        if (event.get_scroll_direction() == Clutter.ScrollDirection.SMOOTH)
-            delta = Math.abs(event.get_scroll_delta()[0]);
-        else
-            delta = 5;
-
-        this._lockScreenScrollCounter += delta;
-
-        // 7 standard scrolls to lift up
-        if (this._lockScreenScrollCounter > 35)
-            this._liftShield(true, 0);
-
-        return Clutter.EVENT_STOP;
-    }
-
    _syncInhibitor() {
        let lockEnabled = this._settings.get_boolean(LOCK_ENABLED_KEY);
        let lockLocked = this._lockSettings.get_boolean(DISABLE_LOCK_KEY);
@@ -736,78 +222,6 @@ var ScreenShield = class {
        }
    }

-    _animateArrows() {
-        let arrows = this._arrowContainer.get_children();
-        let unitaryDelay = ARROW_ANIMATION_TIME / (arrows.length + 1);
-        let maxOpacity = 255 * ARROW_ANIMATION_PEAK_OPACITY;
-        for (let i = 0; i < arrows.length; i++) {
-            arrows[i].opacity = 0;
-            arrows[i].ease({
-                opacity: maxOpacity,
-                delay: unitaryDelay * (N_ARROWS - (i + 1)),
-                duration: ARROW_ANIMATION_TIME / 2,
-                mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-                onComplete: () => {
-                    arrows[i].ease({
-                        opacity: 0,
-                        duration: ARROW_ANIMATION_TIME / 2,
-                        mode: Clutter.AnimationMode.EASE_IN_QUAD,
-                    });
-                },
-            });
-        }
-
-        return GLib.SOURCE_CONTINUE;
-    }
-
-    _onDragBegin() {
-        this._lockScreenGroup.remove_all_transitions();
-        this._lockScreenState = MessageTray.State.HIDING;
-
-        if (this._isLocked)
-            this._ensureUnlockDialog(false, false);
-
-        return true;
-    }
-
-    _onDragMotion() {
-        let [, origY] = this._dragAction.get_press_coords(0);
-        let [, currentY] = this._dragAction.get_motion_coords(0);
-
-        let newY = currentY - origY;
-        newY = clamp(newY, -global.stage.height, 0);
-
-        this._lockScreenGroup.translation_y = newY;
-
-        return true;
-    }
-
-    _onDragEnd(_action, _actor, _eventX, _eventY, _modifiers) {
-        if (this._lockScreenState != MessageTray.State.HIDING)
-            return;
-        if (this._lockScreenGroup.translation_y < -(ARROW_DRAG_THRESHOLD * global.stage.height)) {
-            // Complete motion automatically
-            let [velocity_, velocityX_, velocityY] = this._dragAction.get_velocity(0);
-            this._liftShield(true, -velocityY);
-        } else {
-            // restore the lock screen to its original place
-            // try to use the same speed as the normal animation
-            let h = global.stage.height;
-            let duration = MANUAL_FADE_TIME * -this._lockScreenGroup.translation_y / h;
-            this._lockScreenGroup.remove_all_transitions();
-            this._lockScreenGroup.ease({
-                translation_y: 0,
-                duration,
-                mode: Clutter.AnimationMode.EASE_IN_QUAD,
-                onComplete: () => {
-                    this._lockScreenState = MessageTray.State.SHOWN;
-                },
-            });
-
-            this._maybeCancelDialog();
-        }
-    }
-
    _onStatusChanged(status) {
        if (status != GnomeSession.PresenceStatus.IDLE)
            return;
@@ -913,14 +327,10 @@ var ScreenShield = class {
        this.actor.show();
        this._isGreeter = Main.sessionMode.isGreeter;
        this._isLocked = true;
-        if (this._ensureUnlockDialog(true, true))
-            this._hideLockScreen(false, 0);
+        this._ensureUnlockDialog(true);
    }

    _hideLockScreenComplete() {
-        if (Main.sessionMode.currentMode == 'lock-screen')
-            Main.sessionMode.popMode('lock-screen');
-
        this._lockScreenState = MessageTray.State.HIDDEN;
        this._lockScreenGroup.hide();

@@ -930,13 +340,13 @@ var ScreenShield = class {
        }
    }

-    _hideLockScreen(animate, velocity) {
+    _hideLockScreen(animate) {
        if (this._lockScreenState == MessageTray.State.HIDDEN)
            return;

        this._lockScreenState = MessageTray.State.HIDING;

-        this._lockScreenGroup.remove_all_transitions();
+        this._lockDialogGroup.remove_all_transitions();

        if (animate) {
            // Tween the lock screen out of screen
@@ -944,16 +354,14 @@ var ScreenShield = class {
            // use the same speed regardless of original position
            // if velocity is specified, it's in pixels per milliseconds
            let h = global.stage.height;
-            let delta = h + this._lockScreenGroup.translation_y;
-            let minVelocity = global.stage.height / CURTAIN_SLIDE_TIME;
-
-            velocity = Math.max(minVelocity, velocity);
+            let delta = h + this._lockDialogGroup.translation_y;
+            let velocity = global.stage.height / CURTAIN_SLIDE_TIME;
            let duration = delta / velocity;

-            this._lockScreenGroup.ease({
+            this._lockDialogGroup.ease({
                translation_y: -h,
                duration,
-                mode: Clutter.AnimationMode.EASE_IN_QUAD,
+                mode: Clutter.AnimationMode.EASE_OUT_QUAD,
                onComplete: () => this._hideLockScreenComplete(),
            });
        } else {
@@ -963,7 +371,7 @@ var ScreenShield = class {
        this._cursorTracker.set_pointer_visible(true);
    }

-    _ensureUnlockDialog(onPrimary, allowCancel) {
+    _ensureUnlockDialog(allowCancel) {
        if (!this._dialog) {
            let constructor = Main.sessionMode.unlockDialog;
            if (!constructor) {
@@ -975,7 +383,7 @@ var ScreenShield = class {
            this._dialog = new constructor(this._lockDialogGroup);

            let time = global.get_current_time();
-            if (!this._dialog.open(time, onPrimary)) {
+            if (!this._dialog.open(time)) {
                // This is kind of an impossible error: we're already modal
                // by the time we reach this...
                log('Could not open login dialog: failed to acquire grab');
@@ -984,9 +392,12 @@ var ScreenShield = class {
            }

            this._dialog.connect('failed', this._onUnlockFailed.bind(this));
+            this._wakeUpScreenId = this._dialog.connect(
+                'wake-up-screen', this._wakeUpScreen.bind(this));
        }

        this._dialog.allowCancel = allowCancel;
+        this._dialog.grab_key_focus();
        return true;
    }

@@ -1003,21 +414,17 @@ var ScreenShield = class {
        if (this._lockScreenState != MessageTray.State.HIDDEN)
            return;

-        this._ensureLockScreen();
-        this._lockDialogGroup.scale_x = 1;
-        this._lockDialogGroup.scale_y = 1;
-
        this._lockScreenGroup.show();
        this._lockScreenState = MessageTray.State.SHOWING;

        let fadeToBlack = params.fadeToBlack;

        if (params.animateLockScreen) {
-            this._lockScreenGroup.translation_y = -global.screen_height;
-            this._lockScreenGroup.remove_all_transitions();
-            this._lockScreenGroup.ease({
+            this._lockDialogGroup.translation_y = -global.screen_height;
+            this._lockDialogGroup.remove_all_transitions();
+            this._lockDialogGroup.ease({
                translation_y: 0,
-                duration: MANUAL_FADE_TIME,
+                duration: Overview.ANIMATION_TIME,
                mode: Clutter.AnimationMode.EASE_OUT_QUAD,
                onComplete: () => {
                    this._lockScreenShown({ fadeToBlack, animateFade: true });
@@ -1028,69 +435,10 @@ var ScreenShield = class {
            this._lockScreenShown({ fadeToBlack, animateFade: false });
        }

-        this._lockScreenGroup.grab_key_focus();
-
-        if (Main.sessionMode.currentMode != 'lock-screen')
-            Main.sessionMode.pushMode('lock-screen');
-    }
-
-    _startArrowAnimation() {
-        this._arrowActiveWatchId = 0;
-
-        if (!this._arrowAnimationId) {
-            this._arrowAnimationId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, 6000, this._animateArrows.bind(this));
-            GLib.Source.set_name_by_id(this._arrowAnimationId, '[gnome-shell] this._animateArrows');
-            this._animateArrows();
-        }
-
-        if (!this._arrowWatchId) {
-            this._arrowWatchId = this.idleMonitor.add_idle_watch(ARROW_IDLE_TIME,
-                                                                 this._pauseArrowAnimation.bind(this));
-        }
-    }
-
-    _pauseArrowAnimation() {
-        if (this._arrowAnimationId) {
-            GLib.source_remove(this._arrowAnimationId);
-            this._arrowAnimationId = 0;
-        }
-
-        if (!this._arrowActiveWatchId)
-            this._arrowActiveWatchId = this.idleMonitor.add_user_active_watch(this._startArrowAnimation.bind(this));
-    }
-
-    _stopArrowAnimation() {
-        if (this._arrowAnimationId) {
-            GLib.source_remove(this._arrowAnimationId);
-            this._arrowAnimationId = 0;
-        }
-        if (this._arrowActiveWatchId) {
-            this.idleMonitor.remove_watch(this._arrowActiveWatchId);
-            this._arrowActiveWatchId = 0;
-        }
-        if (this._arrowWatchId) {
-            this.idleMonitor.remove_watch(this._arrowWatchId);
-            this._arrowWatchId = 0;
-        }
-    }
-
-    _checkArrowAnimation() {
-        let idleTime = this.idleMonitor.get_idletime();
-
-        if (idleTime < ARROW_IDLE_TIME)
-            this._startArrowAnimation();
-        else
-            this._pauseArrowAnimation();
+        this._dialog.grab_key_focus();
    }

    _lockScreenShown(params) {
-        if (this._dialog && !this._isGreeter) {
-            this._dialog.destroy();
-            this._dialog = null;
-        }
-
-        this._checkArrowAnimation();
-
        let motionId = global.stage.connect('captured-event', (stage, event) => {
            if (event.type() == Clutter.EventType.MOTION) {
                this._cursorTracker.set_pointer_visible(true);
@@ -1102,7 +450,6 @@ var ScreenShield = class {
        this._cursorTracker.set_pointer_visible(false);

        this._lockScreenState = MessageTray.State.SHOWN;
-        this._lockScreenScrollCounter = 0;

        if (params.fadeToBlack && params.animateFade) {
            // Take a beat
@@ -1125,52 +472,11 @@ var ScreenShield = class {
        this.emit('lock-screen-shown');
    }

-    // Some of the actors in the lock screen are heavy in
-    // resources, so we only create them when needed
-    _ensureLockScreen() {
-        if (this._hasLockScreen)
-            return;
-
-        this._lockScreenContentsBox = new St.BoxLayout({ x_align: Clutter.ActorAlign.CENTER,
-                                                         y_align: Clutter.ActorAlign.CENTER,
-                                                         x_expand: true,
-                                                         y_expand: true,
-                                                         vertical: true,
-                                                         style_class: 'screen-shield-contents-box' });
-        this._clock = new Clock();
-        this._lockScreenContentsBox.add_child(this._clock);
-
-        this._lockScreenContents.add_actor(this._lockScreenContentsBox);
-
-        this._notificationsBox = new NotificationsBox();
-        this._wakeUpScreenId = this._notificationsBox.connect('wake-up-screen', this._wakeUpScreen.bind(this));
-        this._lockScreenContentsBox.add_child(this._notificationsBox);
-
-        this._hasLockScreen = true;
-    }
-
    _wakeUpScreen() {
        this._onUserBecameActive();
        this.emit('wake-up-screen');
    }

-    _clearLockScreen() {
-        this._clock.destroy();
-        this._clock = null;
-
-        if (this._notificationsBox) {
-            this._notificationsBox.disconnect(this._wakeUpScreenId);
-            this._notificationsBox.destroy();
-            this._notificationsBox = null;
-        }
-
-        this._stopArrowAnimation();
-
-        this._lockScreenContentsBox.destroy();
-
-        this._hasLockScreen = false;
-    }
-
    get locked() {
        return this._isLocked;
    }
@@ -1191,13 +497,8 @@ var ScreenShield = class {
    }

    _continueDeactivate(animate) {
-        this._hideLockScreen(animate, 0);
+        this._hideLockScreen(animate);

-        if (this._hasLockScreen)
-            this._clearLockScreen();
-
-        if (Main.sessionMode.currentMode == 'lock-screen')
-            Main.sessionMode.popMode('lock-screen');
        if (Main.sessionMode.currentMode == 'unlock-dialog')
            Main.sessionMode.popMode('unlock-dialog');

@@ -1223,9 +524,8 @@ var ScreenShield = class {
        }

        this._lockDialogGroup.ease({
-            scale_x: 0,
-            scale_y: 0,
-            duration: animate ? Overview.ANIMATION_TIME : 0,
+            translation_y: -global.screen_height,
+            duration: Overview.ANIMATION_TIME,
            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
            onComplete: () => this._completeDeactivate(),
        });
@@ -1262,10 +562,11 @@ var ScreenShield = class {
        if (this._activationTime == 0)
            this._activationTime = GLib.get_monotonic_time();

+        this._ensureUnlockDialog(true);
+
        this.actor.show();

-        if (Main.sessionMode.currentMode != 'unlock-dialog' &&
-            Main.sessionMode.currentMode != 'lock-screen') {
+        if (Main.sessionMode.currentMode !== 'unlock-dialog') {
            this._isGreeter = Main.sessionMode.isGreeter;
            if (!this._isGreeter)
                Main.sessionMode.pushMode('unlock-dialog');
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@@ -53,19 +53,6 @@ const _modes = {
        panelStyle: 'login-screen',
    },

-    'lock-screen': {
-        isLocked: true,
-        isGreeter: undefined,
-        unlockDialog: undefined,
-        components: ['polkitAgent', 'telepathyClient'],
-        panel: {
-            left: [],
-            center: [],
-            right: ['aggregateMenu'],
-        },
-        panelStyle: 'lock-screen',
-    },
-
    'unlock-dialog': {
        isLocked: true,
        unlockDialog: undefined,
--- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@@ -1,41 +1,539 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported UnlockDialog */

-const { AccountsService, Atk, Clutter,
-        Gdm, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
+const { AccountsService, Atk, Clutter, Gdm, Gio,
+        GnomeDesktop, GLib, GObject, Meta, Shell, St } = imports.gi;

+const Background = imports.ui.background;
 const Layout = imports.ui.layout;
 const Main = imports.ui.main;
+const MessageTray = imports.ui.messageTray;

 const AuthPrompt = imports.gdm.authPrompt;

 // The timeout before going back automatically to the lock screen (in seconds)
 const IDLE_TIMEOUT = 2 * 60;

+const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver';
+
+const CROSSFADE_TIME = 300;
+
+const BLUR_BRIGHTNESS = 0.55;
+const BLUR_RADIUS = 200;
+
+const SUMMARY_ICON_SIZE = 32;
+
+var NotificationsBox = GObject.registerClass({
+    Signals: { 'wake-up-screen': {} },
+}, class NotificationsBox extends St.BoxLayout {
+    _init() {
+        super._init({
+            vertical: true,
+            name: 'unlockDialogNotifications',
+            style_class: 'unlock-dialog-notifications-container',
+        });
+
+        this._scrollView = new St.ScrollView({ hscrollbar_policy: St.PolicyType.NEVER });
+        this._notificationBox = new St.BoxLayout({
+            vertical: true,
+            style_class: 'unlock-dialog-notifications-container',
+        });
+        this._scrollView.add_actor(this._notificationBox);
+
+        this.add_child(this._scrollView);
+
+        this._sources = new Map();
+        Main.messageTray.getSources().forEach(source => {
+            this._sourceAdded(Main.messageTray, source, true);
+        });
+        this._updateVisibility();
+
+        this._sourceAddedId = Main.messageTray.connect('source-added', this._sourceAdded.bind(this));
+
+        this.connect('destroy', this._onDestroy.bind(this));
+    }
+
+    _onDestroy() {
+        if (this._sourceAddedId) {
+            Main.messageTray.disconnect(this._sourceAddedId);
+            this._sourceAddedId = 0;
+        }
+
+        let items = this._sources.entries();
+        for (let [source, obj] of items)
+            this._removeSource(source, obj);
+    }
+
+    _updateVisibility() {
+        this._notificationBox.visible =
+            this._notificationBox.get_children().some(a => a.visible);
+
+        this.visible = this._notificationBox.visible;
+    }
+
+    _makeNotificationSource(source, box) {
+        let sourceActor = new MessageTray.SourceActor(source, SUMMARY_ICON_SIZE);
+        box.add_child(sourceActor);
+
+        let textBox = new St.BoxLayout({
+            x_expand: true,
+            y_expand: true,
+            y_align: Clutter.ActorAlign.CENTER,
+        });
+        box.add_child(textBox);
+
+        let title = new St.Label({
+            text: source.title,
+            style_class: 'unlock-dialog-notification-label',
+            x_expand: true,
+            x_align: Clutter.ActorAlign.START,
+        });
+        textBox.add(title);
+
+        let count = source.unseenCount;
+        let countLabel = new St.Label({
+            text: `${count}`,
+            style_class: 'unlock-dialog-notification-count-text',
+        });
+        textBox.add(countLabel);
+
+        box.visible = count !== 0;
+        return [title, countLabel];
+    }
+
+    _makeNotificationDetailedSource(source, box) {
+        let sourceActor = new MessageTray.SourceActor(source, SUMMARY_ICON_SIZE);
+        let sourceBin = new St.Bin({ child: sourceActor });
+        box.add(sourceBin);
+
+        let textBox = new St.BoxLayout({ vertical: true });
+        box.add_child(textBox);
+
+        let title = new St.Label({
+            text: source.title,
+            style_class: 'unlock-dialog-notification-label',
+        });
+        textBox.add(title);
+
+        let visible = false;
+        for (let i = 0; i < source.notifications.length; i++) {
+            let n = source.notifications[i];
+
+            if (n.acknowledged)
+                continue;
+
+            let body = '';
+            if (n.bannerBodyText) {
+                body = n.bannerBodyMarkup
+                    ? n.bannerBodyText
+                    : GLib.markup_escape_text(n.bannerBodyText, -1);
+            }
+
+            let label = new St.Label({ style_class: 'unlock-dialog-notification-count-text' });
+            label.clutter_text.set_markup(`<b>${n.title}</b> ${body}`);
+            textBox.add(label);
+
+            visible = true;
+        }
+
+        box.visible = visible;
+        return [title, null];
+    }
+
+    _shouldShowDetails(source) {
+        return source.policy.detailsInLockScreen ||
+               source.narrowestPrivacyScope === MessageTray.PrivacyScope.SYSTEM;
+    }
+
+    _updateSourceBoxStyle(source, obj, box) {
+        let hasCriticalNotification =
+            source.notifications.some(n => n.urgency === MessageTray.Urgency.CRITICAL);
+
+        if (hasCriticalNotification !== obj.hasCriticalNotification) {
+            obj.hasCriticalNotification = hasCriticalNotification;
+
+            if (hasCriticalNotification)
+                box.add_style_class_name('critical');
+            else
+                box.remove_style_class_name('critical');
+        }
+    }
+
+    _showSource(source, obj, box) {
+        if (obj.detailed)
+            [obj.titleLabel, obj.countLabel] = this._makeNotificationDetailedSource(source, box);
+        else
+            [obj.titleLabel, obj.countLabel] = this._makeNotificationSource(source, box);
+
+        box.visible = obj.visible && (source.unseenCount > 0);
+
+        this._updateSourceBoxStyle(source, obj, box);
+    }
+
+    _sourceAdded(tray, source, initial) {
+        let obj = {
+            visible: source.policy.showInLockScreen,
+            detailed: this._shouldShowDetails(source),
+            sourceDestroyId: 0,
+            sourceCountChangedId: 0,
+            sourceTitleChangedId: 0,
+            sourceUpdatedId: 0,
+            sourceBox: null,
+            titleLabel: null,
+            countLabel: null,
+            hasCriticalNotification: false,
+        };
+
+        obj.sourceBox = new St.BoxLayout({
+            style_class: 'unlock-dialog-notification-source',
+            x_expand: true,
+        });
+        this._showSource(source, obj, obj.sourceBox);
+        this._notificationBox.add_child(obj.sourceBox);
+
+        obj.sourceCountChangedId = source.connect('notify::count', () => {
+            this._countChanged(source, obj);
+        });
+        obj.sourceTitleChangedId = source.connect('notify::title', () => {
+            this._titleChanged(source, obj);
+        });
+        obj.policyChangedId = source.policy.connect('notify', (policy, pspec) => {
+            if (pspec.name === 'show-in-lock-screen')
+                this._visibleChanged(source, obj);
+            else
+                this._detailedChanged(source, obj);
+        });
+        obj.sourceDestroyId = source.connect('destroy', () => {
+            this._onSourceDestroy(source, obj);
+        });
+
+        this._sources.set(source, obj);
+
+        if (!initial) {
+            // block scrollbars while animating, if they're not needed now
+            let boxHeight = this._notificationBox.height;
+            if (this._scrollView.height >= boxHeight)
+                this._scrollView.vscrollbar_policy = St.PolicyType.NEVER;
+
+            let widget = obj.sourceBox;
+            let [, natHeight] = widget.get_preferred_height(-1);
+            widget.height = 0;
+            widget.ease({
+                height: natHeight,
+                mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+                duration: 250,
+                onComplete: () => {
+                    this._scrollView.vscrollbar_policy = St.PolicyType.AUTOMATIC;
+                    widget.set_height(-1);
+                },
+            });
+
+            this._updateVisibility();
+            if (obj.sourceBox.visible)
+                this.emit('wake-up-screen');
+        }
+    }
+
+    _titleChanged(source, obj) {
+        obj.titleLabel.text = source.title;
+    }
+
+    _countChanged(source, obj) {
+        // A change in the number of notifications may change whether we show
+        // details.
+        let newDetailed = this._shouldShowDetails(source);
+        let oldDetailed = obj.detailed;
+
+        obj.detailed = newDetailed;
+
+        if (obj.detailed || oldDetailed !== newDetailed) {
+            // A new notification was pushed, or a previous notification was destroyed.
+            // Give up, and build the list again.
+
+            obj.sourceBox.destroy_all_children();
+            obj.titleLabel = obj.countLabel = null;
+            this._showSource(source, obj, obj.sourceBox);
+        } else {
+            let count = source.unseenCount;
+            obj.countLabel.text = `${count}`;
+        }
+
+        obj.sourceBox.visible = obj.visible && (source.unseenCount > 0);
+
+        this._updateVisibility();
+        if (obj.sourceBox.visible)
+            this.emit('wake-up-screen');
+    }
+
+    _visibleChanged(source, obj) {
+        if (obj.visible === source.policy.showInLockScreen)
+            return;
+
+        obj.visible = source.policy.showInLockScreen;
+        obj.sourceBox.visible = obj.visible && source.unseenCount > 0;
+
+        this._updateVisibility();
+        if (obj.sourceBox.visible)
+            this.emit('wake-up-screen');
+    }
+
+    _detailedChanged(source, obj) {
+        let newDetailed = this._shouldShowDetails(source);
+        if (obj.detailed === newDetailed)
+            return;
+
+        obj.detailed = newDetailed;
+
+        obj.sourceBox.destroy_all_children();
+        obj.titleLabel = obj.countLabel = null;
+        this._showSource(source, obj, obj.sourceBox);
+    }
+
+    _onSourceDestroy(source, obj) {
+        this._removeSource(source, obj);
+        this._updateVisibility();
+    }
+
+    _removeSource(source, obj) {
+        obj.sourceBox.destroy();
+        obj.sourceBox = obj.titleLabel = obj.countLabel = null;
+
+        source.disconnect(obj.sourceDestroyId);
+        source.disconnect(obj.sourceCountChangedId);
+        source.disconnect(obj.sourceTitleChangedId);
+        source.policy.disconnect(obj.policyChangedId);
+
+        this._sources.delete(source);
+    }
+});
+
+var Clock = GObject.registerClass(
+class UnlockDialogClock extends St.BoxLayout {
+    _init() {
+        super._init({ style_class: 'unlock-dialog-clock', vertical: true });
+
+        this._time = new St.Label({
+            style_class: 'unlock-dialog-clock-time',
+            x_align: Clutter.ActorAlign.CENTER,
+        });
+        this._date = new St.Label({
+            style_class: 'unlock-dialog-clock-date',
+            x_align: Clutter.ActorAlign.CENTER,
+        });
+
+        this.add_child(this._time);
+        this.add_child(this._date);
+
+        this._wallClock = new GnomeDesktop.WallClock({ time_only: true });
+        this._wallClock.connect('notify::clock', this._updateClock.bind(this));
+
+        this._updateClock();
+
+        this.connect('destroy', this._onDestroy.bind(this));
+    }
+
+    _updateClock() {
+        this._time.text = this._wallClock.clock;
+
+        let date = new Date();
+        /* Translators: This is a time format for a date in
+           long format */
+        let dateFormat = Shell.util_translate_time_string(N_('%A %B %-d'));
+        this._date.text = date.toLocaleFormat(dateFormat);
+    }
+
+    _onDestroy() {
+        this._wallClock.run_dispose();
+    }
+});
+
+var UnlockDialogLayout = GObject.registerClass(
+class UnlockDialogLayout extends Clutter.LayoutManager {
+    _init(stack, notifications) {
+        super._init();
+
+        this._stack = stack;
+        this._notifications = notifications;
+    }
+
+    vfunc_get_preferred_width(container, forHeight) {
+        return this._stack.get_preferred_width(forHeight);
+    }
+
+    vfunc_get_preferred_height(container, forWidth) {
+        return this._stack.get_preferred_height(forWidth);
+    }
+
+    vfunc_allocate(container, box, flags) {
+        let [width, height] = box.get_size();
+
+        let tenthOfHeight = height / 10.0;
+        let thirdOfHeight = height / 3.0;
+
+        let [, , stackWidth, stackHeight] =
+            this._stack.get_preferred_size();
+
+        let [, , notificationsWidth, notificationsHeight] =
+            this._notifications.get_preferred_size();
+
+        let columnWidth = Math.max(stackWidth, notificationsWidth);
+
+        let columnX1 = Math.floor((width - columnWidth) / 2.0);
+        let actorBox = new Clutter.ActorBox();
+
+        // Notifications
+        let maxNotificationsHeight = Math.min(
+            notificationsHeight,
+            height - tenthOfHeight - stackHeight);
+
+        actorBox.x1 = columnX1;
+        actorBox.y1 = height - maxNotificationsHeight;
+        actorBox.x2 = columnX1 + columnWidth;
+        actorBox.y2 = actorBox.y1 + maxNotificationsHeight;
+
+        this._notifications.allocate(actorBox, flags);
+
+        // Authentication Box
+        let stackY = Math.min(
+            thirdOfHeight,
+            height - stackHeight - maxNotificationsHeight);
+
+        actorBox.x1 = columnX1;
+        actorBox.y1 = stackY;
+        actorBox.x2 = columnX1 + columnWidth;
+        actorBox.y2 = stackY + stackHeight;
+
+        this._stack.allocate(actorBox, flags);
+    }
+});
+
 var UnlockDialog = GObject.registerClass({
-    Signals: { 'failed': {} },
+    Signals: {
+        'failed': {},
+        'wake-up-screen': {},
+    },
 }, class UnlockDialog extends St.Widget {
    _init(parentActor) {
        super._init({
            accessible_role: Atk.Role.WINDOW,
            style_class: 'login-dialog',
-            layout_manager: new Clutter.BoxLayout(),
            visible: false,
+            can_focus: true,
+            reactive: true,
        });

-        this.add_constraint(new Layout.MonitorConstraint({ primary: true }));
        parentActor.add_child(this);

+        this._activePage = null;
+
+        let tapAction = new Clutter.TapAction();
+        tapAction.connect('tap', this._showPrompt.bind(this));
+        this.add_action(tapAction);
+
+        // Background
+        this._backgroundGroup = new Clutter.Actor();
+        this.add_child(this._backgroundGroup);
+
+        this._bgManagers = [];
+
+        this._updateBackgrounds();
+        this._monitorsChangedId =
+            Main.layoutManager.connect('monitors-changed', this._updateBackgrounds.bind(this));
+
        this._userManager = AccountsService.UserManager.get_default();
        this._userName = GLib.get_user_name();
        this._user = this._userManager.get_user(this._userName);

-        this._promptBox = new St.BoxLayout({ vertical: true,
-                                             x_align: Clutter.ActorAlign.CENTER,
-                                             y_align: Clutter.ActorAlign.CENTER,
-                                             x_expand: true,
-                                             y_expand: true });
-        this.add_child(this._promptBox);
+        // Authentication & Clock stack
+        let stack = new Shell.Stack();
+
+        this._promptBox = new St.BoxLayout({ vertical: true });
+        stack.add_child(this._promptBox);
+
+        this._clock = new Clock();
+        stack.add_child(this._clock);
+        this._showClock();
+
+        this.allowCancel = false;
+
+        Main.ctrlAltTabManager.addGroup(this, _('Unlock Window'), 'dialog-password-symbolic');
+
+        // Notifications
+        this._notificationsBox = new NotificationsBox();
+        this._notificationsBox.connect('wake-up-screen', () => this.emit('wake-up-screen'));
+
+        // Main Box
+        let mainBox = new Clutter.Actor();
+        mainBox.add_constraint(new Layout.MonitorConstraint({ primary: true }));
+        mainBox.add_child(stack);
+        mainBox.add_child(this._notificationsBox);
+        mainBox.layout_manager = new UnlockDialogLayout(
+            stack,
+            this._notificationsBox);
+        this.add_child(mainBox);
+
+        this._idleMonitor = Meta.IdleMonitor.get_core();
+        this._idleWatchId = this._idleMonitor.add_idle_watch(IDLE_TIMEOUT * 1000, this._escape.bind(this));
+
+        this.connect('destroy', this._onDestroy.bind(this));
+    }
+
+    vfunc_key_press_event(keyEvent) {
+        if (this._activePage === this._promptBox ||
+            (this._promptBox && this._promptBox.visible))
+            return Clutter.EVENT_PROPAGATE;
+
+        let unichar = keyEvent.unicode_value;
+
+        this._showPrompt();
+
+        if (GLib.unichar_isgraph(unichar))
+            this.addCharacter(unichar);
+
+        return Clutter.EVENT_PROPAGATE;
+    }
+
+    _createBackground(monitorIndex) {
+        let monitor = Main.layoutManager.monitors[monitorIndex];
+        let widget = new St.Widget({
+            style_class: 'screen-shield-background',
+            x: monitor.x,
+            y: monitor.y,
+            width: monitor.width,
+            height: monitor.height,
+        });
+
+        let bgManager = new Background.BackgroundManager({
+            container: widget,
+            monitorIndex,
+            controlPosition: false,
+            settingsSchema: SCREENSAVER_SCHEMA,
+        });
+
+        this._bgManagers.push(bgManager);
+
+        this._backgroundGroup.add_child(widget);
+
+        widget.add_effect(new Shell.BlurEffect({
+            brightness: BLUR_BRIGHTNESS,
+            blur_radius: BLUR_RADIUS,
+        }));
+    }
+
+    _updateBackgrounds() {
+        for (let i = 0; i < this._bgManagers.length; i++)
+            this._bgManagers[i].destroy();
+
+        this._bgManagers = [];
+        this._backgroundGroup.destroy_all_children();
+
+        for (let i = 0; i < Main.layoutManager.monitors.length; i++)
+            this._createBackground(i);
+    }
+
+    _ensureAuthPrompt() {
+        if (this._authPrompt)
+            return;

        this._authPrompt = new AuthPrompt.AuthPrompt(new Gdm.Client(), AuthPrompt.AuthPromptMode.UNLOCK_ONLY);
        this._authPrompt.connect('failed', this._fail.bind(this));
@@ -45,16 +543,18 @@ var UnlockDialog = GObject.registerClass({

        this._promptBox.add_child(this._authPrompt);

-        this.allowCancel = false;
-
        let screenSaverSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.screensaver' });
        if (screenSaverSettings.get_boolean('user-switch-enabled')) {
-            let otherUserLabel = new St.Label({ text: _("Log in as another user"),
-                                                style_class: 'login-dialog-not-listed-label' });
-            this._otherUserButton = new St.Button({ style_class: 'login-dialog-not-listed-button',
-                                                    can_focus: true,
-                                                    child: otherUserLabel,
-                                                    reactive: true });
+            let otherUserLabel = new St.Label({
+                text: _('Log in as another user'),
+                style_class: 'login-dialog-not-listed-label',
+            });
+            this._otherUserButton = new St.Button({
+                style_class: 'login-dialog-not-listed-button',
+                can_focus: true,
+                child: otherUserLabel,
+                reactive: true,
+            });
            this._otherUserButton.connect('clicked', this._otherUserClicked.bind(this));
            this._promptBox.add_child(this._otherUserButton);
        } else {
@@ -63,13 +563,24 @@ var UnlockDialog = GObject.registerClass({

        this._authPrompt.reset();
        this._updateSensitivity(true);
+    }

-        Main.ctrlAltTabManager.addGroup(this, _("Unlock Window"), 'dialog-password-symbolic');
+    _maybeDestroyAuthPrompt() {
+        let focus = global.stage.key_focus;
+        if (focus === null ||
+            (this._authPrompt && this._authPrompt.contains(focus)) ||
+            (this._otherUserButton && focus === this._otherUserButton))
+            this.grab_key_focus();

-        this._idleMonitor = Meta.IdleMonitor.get_core();
-        this._idleWatchId = this._idleMonitor.add_idle_watch(IDLE_TIMEOUT * 1000, this._escape.bind(this));
+        if (this._authPrompt) {
+            this._authPrompt.destroy();
+            this._authPrompt = null;
+        }

-        this.connect('destroy', this._onDestroy.bind(this));
+        if (this._otherUserButton) {
+            this._otherUserButton.destroy();
+            this._otherUserButton = null;
+        }
    }

    _updateSensitivity(sensitive) {
@@ -81,7 +592,55 @@ var UnlockDialog = GObject.registerClass({
        }
    }

+    _showClock() {
+        if (this._activePage === this._clock)
+            return;
+
+        this._activePage = this._clock;
+        this._clock.show();
+
+        this._promptBox.ease({
+            opacity: 0,
+            duration: CROSSFADE_TIME,
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+            onComplete: () => {
+                this._promptBox.hide();
+                this._maybeDestroyAuthPrompt();
+            },
+        });
+
+        this._clock.ease({
+            opacity: 255,
+            duration: CROSSFADE_TIME,
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+        });
+    }
+
+    _showPrompt() {
+        this._ensureAuthPrompt();
+
+        if (this._activePage === this._promptBox)
+            return;
+
+        this._activePage = this._promptBox;
+        this._promptBox.show();
+
+        this._clock.ease({
+            opacity: 0,
+            duration: CROSSFADE_TIME,
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+            onComplete: () => this._clock.hide(),
+        });
+
+        this._promptBox.ease({
+            opacity: 255,
+            duration: CROSSFADE_TIME,
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+        });
+    }
+
    _fail() {
+        this._showClock();
        this.emit('failed');
    }

@@ -115,19 +674,25 @@ var UnlockDialog = GObject.registerClass({
            this._idleMonitor.remove_watch(this._idleWatchId);
            this._idleWatchId = 0;
        }
+
+        if (this._monitorsChangedId) {
+            Main.layoutManager.disconnect(this._monitorsChangedId);
+            delete this._monitorsChangedId;
+        }
    }

    cancel() {
-        this._authPrompt.cancel();
-
-        this.destroy();
+        if (this._authPrompt)
+            this._authPrompt.cancel();
    }

    addCharacter(unichar) {
+        this._showPrompt();
        this._authPrompt.addCharacter(unichar);
    }

    finish(onComplete) {
+        this._ensureAuthPrompt();
        this._authPrompt.finish(onComplete);
    }

@@ -149,6 +714,10 @@ var UnlockDialog = GObject.registerClass({
        return true;
    }

+    activate() {
+        this._showPrompt();
+    }
+
    popModal(timestamp) {
        if (this._isModal) {
            Main.popModal(this, timestamp);
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -155,8 +155,7 @@ var WindowClone = GObject.registerClass({

        this._updateAttachedDialogs();
        this._computeBoundingBox();
-        this.x = this._boundingBox.x;
-        this.y = this._boundingBox.y;
+        this.set_translation(this._boundingBox.x, this._boundingBox.y, 0);

        this._computeWindowCenter();

@@ -1364,8 +1363,8 @@ class Workspace extends St.Widget {
            if (!clone.positioned) {
                // This window appeared after the overview was already up
                // Grow the clone from the center of the slot
-                clone.x = x + cloneWidth / 2;
-                clone.y = y + cloneHeight / 2;
+                clone.translation_x = x + cloneWidth / 2;
+                clone.translation_y = y + cloneHeight / 2;
                clone.scale_x = 0;
                clone.scale_y = 0;
                clone.positioned = true;
@@ -1380,8 +1379,8 @@ class Workspace extends St.Widget {
                        clone.opacity = 0;
                        clone.scale_x = 0;
                        clone.scale_y = 0;
-                        clone.x = x;
-                        clone.y = y;
+                        clone.translation_x = x;
+                        clone.translation_y = y;
                    }

                    clone.ease({
@@ -1395,7 +1394,7 @@ class Workspace extends St.Widget {
            } else {
                // cancel any active tweens (otherwise they might override our changes)
                clone.remove_all_transitions();
-                clone.set_position(x, y);
+                clone.set_translation(x, y, 0);
                clone.set_scale(scale, scale);
                clone.set_opacity(255);
                clone.overlay.relayout(false);
@@ -1425,7 +1424,8 @@ class Workspace extends St.Widget {

    _animateClone(clone, overlay, x, y, scale) {
        clone.ease({
-            x, y,
+            translation_x: x,
+            translation_y: y,
            scale_x: scale,
            scale_y: scale,
            duration: Overview.ANIMATION_TIME,
@@ -1570,7 +1570,7 @@ class Workspace extends St.Widget {
            clone.slot = [x, y, clone.width * scale, clone.height * scale];
            clone.positioned = true;

-            clone.set_position(x, y);
+            clone.set_translation(x, y, 0);
            clone.set_scale(scale, scale);
            clone.overlay.relayout(false);
        }
@@ -1725,8 +1725,8 @@ class Workspace extends St.Widget {
            let [origX, origY] = clone.getOriginalPosition();
            clone.scale_x = 1;
            clone.scale_y = 1;
-            clone.x = origX;
-            clone.y = origY;
+            clone.translation_x = origX;
+            clone.translation_y = origY;
            clone.ease({
                opacity,
                duration,
@@ -1776,8 +1776,8 @@ class Workspace extends St.Widget {
        if (clone.metaWindow.showing_on_its_workspace()) {
            let [origX, origY] = clone.getOriginalPosition();
            clone.ease({
-                x: origX,
-                y: origY,
+                translation_x: origX,
+                translation_y: origY,
                scale_x: 1,
                scale_y: 1,
                opacity: 255,
--- a/po/en_GB.po
+++ b/po/en_GB.po
--- a/po/es.po
+++ b/po/es.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell.master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
-"POT-Creation-Date: 2020-02-05 19:49+0000\n"
-"PO-Revision-Date: 2020-02-06 11:25+0100\n"
+"POT-Creation-Date: 2020-02-06 19:01+0000\n"
+"PO-Revision-Date: 2020-02-07 10:20+0100\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Spanish - Spain <gnome-es-list@gnome.org>\n"
 "Language: es_ES\n"
@@ -502,7 +502,6 @@ msgid "Website"
 msgstr "Página web"

 #: js/extensionPrefs/ui/extension-row.ui:192
-#| msgid "Remove"
 msgid "Remove…"
 msgstr "Quitar…"

@@ -557,8 +556,9 @@ msgstr ""
 "ha iniciado sesión en GNOME e inténtelo de nuevo."

 #: js/extensionPrefs/ui/extensions-window.ui:287
-msgid "Logout…"
-msgstr "Cerrar sesión…"
+#| msgid "Log Out"
+msgid "Log Out…"
+msgstr "Cerrar la sesión…"

 #: js/gdm/authPrompt.js:184 js/gdm/authPrompt.js:237 js/gdm/authPrompt.js:468
 msgid "Next"
@@ -844,44 +844,44 @@ msgstr "Denegar acceso"
 msgid "Grant Access"
 msgstr "Conceder acceso"

-#: js/ui/appDisplay.js:904
+#: js/ui/appDisplay.js:906
 msgid "Unnamed Folder"
 msgstr "Carpeta sin nombre"

-#: js/ui/appDisplay.js:927
+#: js/ui/appDisplay.js:929
 msgid "Frequently used applications will appear here"
 msgstr "Las aplicaciones usadas frecuentemente aparecerán aquí"

-#: js/ui/appDisplay.js:1062
+#: js/ui/appDisplay.js:1064
 msgid "Frequent"
 msgstr "Frecuentes"

-#: js/ui/appDisplay.js:1069
+#: js/ui/appDisplay.js:1071
 msgid "All"
 msgstr "Todas"

 #. Translators: This is the heading of a list of open windows
-#: js/ui/appDisplay.js:2452 js/ui/panel.js:75
+#: js/ui/appDisplay.js:2454 js/ui/panel.js:75
 msgid "Open Windows"
 msgstr "Ventanas abiertas"

-#: js/ui/appDisplay.js:2472 js/ui/panel.js:82
+#: js/ui/appDisplay.js:2474 js/ui/panel.js:82
 msgid "New Window"
 msgstr "Ventana nueva"

-#: js/ui/appDisplay.js:2483
+#: js/ui/appDisplay.js:2485
 msgid "Launch using Dedicated Graphics Card"
 msgstr "Lanzar usando la tarjeta gráfica dedicada"

-#: js/ui/appDisplay.js:2511 js/ui/dash.js:239
+#: js/ui/appDisplay.js:2513 js/ui/dash.js:239
 msgid "Remove from Favorites"
 msgstr "Quitar de los favoritos"

-#: js/ui/appDisplay.js:2517
+#: js/ui/appDisplay.js:2519
 msgid "Add to Favorites"
 msgstr "Añadir a los favoritos"

-#: js/ui/appDisplay.js:2527 js/ui/panel.js:93
+#: js/ui/appDisplay.js:2529 js/ui/panel.js:93
 msgid "Show Details"
 msgstr "Mostrar detalles"

@@ -2848,6 +2848,9 @@ msgstr[1] "%u entradas"
 msgid "System Sounds"
 msgstr "Sonidos del sistema"

+#~ msgid "Logout…"
+#~ msgstr "Cerrar sesión…"
+
 #~ msgid "org.gnome.Extensions"
 #~ msgstr "org.gnome.Extensions"

--- a/po/eu.po
+++ b/po/eu.po
--- a/po/fa.po
+++ b/po/fa.po
--- a/po/fi.po
+++ b/po/fi.po
--- a/po/gl.po
+++ b/po/gl.po
--- a/po/id.po
+++ b/po/id.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
-"POT-Creation-Date: 2020-02-03 20:34+0000\n"
-"PO-Revision-Date: 2020-02-04 13:57+0700\n"
+"POT-Creation-Date: 2020-02-06 19:01+0000\n"
+"PO-Revision-Date: 2020-02-07 13:32+0700\n"
 "Last-Translator: Kukuh Syafaat <kukuhsyafaat@gnome.org>\n"
 "Language-Team: Indonesian <gnome-l10n-id@googlegroups.com>\n"
 "Language: id\n"
@@ -53,11 +53,7 @@ msgstr "Buka menu aplikasi"
 msgid "Extensions"
 msgstr "Ekstensi"

-#: data/org.gnome.Extensions.desktop.in.in:5
-msgid "org.gnome.Extensions"
-msgstr "org.gnome.Extensions"
-
-#: data/org.gnome.Extensions.desktop.in.in:6
+#: data/org.gnome.Extensions.desktop.in.in:7
 msgid "Configure GNOME Shell Extensions"
 msgstr "Konfigurasi Ekstensi GNOME Shell"

@@ -480,10 +476,33 @@ msgstr "Kunjungi halaman web ekstensi"
 #: js/extensionPrefs/main.js:449
 #, javascript-format
 msgid "%d extension will be updated on next login."
-msgid_plural "%d extensions will be updated on next login.e"
+msgid_plural "%d extensions will be updated on next login."
 msgstr[0] "%d ekstensi akan diperbarui pada log masuk berikutnya."
 msgstr[1] "%d ekstensi akan diperbarui pada log masuk berikutnya."

+#: js/extensionPrefs/ui/extension-row.ui:100
+#: subprojects/extensions-tool/src/command-create.c:211
+#: subprojects/extensions-tool/src/main.c:173
+msgid "Description"
+msgstr "Deskripsi"
+
+#: js/extensionPrefs/ui/extension-row.ui:123
+#: subprojects/extensions-tool/src/main.c:185
+msgid "Version"
+msgstr "Versi"
+
+#: js/extensionPrefs/ui/extension-row.ui:151
+msgid "Author"
+msgstr "Penulis"
+
+#: js/extensionPrefs/ui/extension-row.ui:175
+msgid "Website"
+msgstr "Situs Web"
+
+#: js/extensionPrefs/ui/extension-row.ui:192
+msgid "Remove…"
+msgstr "Hapus…"
+
 #: js/extensionPrefs/ui/extensions-window.ui:8
 msgid "Help"
 msgstr "Bantuan"
@@ -535,7 +554,7 @@ msgstr ""
 "dipasang. Pastikan Anda masuk ke GNOME dan coba lagi."

 #: js/extensionPrefs/ui/extensions-window.ui:287
-msgid "Logout…"
+msgid "Log Out…"
 msgstr "Keluar…"

 #: js/gdm/authPrompt.js:184 js/gdm/authPrompt.js:237 js/gdm/authPrompt.js:468
@@ -823,44 +842,44 @@ msgstr "Tolak Akses"
 msgid "Grant Access"
 msgstr "Beri Akses"

-#: js/ui/appDisplay.js:904
+#: js/ui/appDisplay.js:906
 msgid "Unnamed Folder"
 msgstr "Folder Tanpa Nama"

-#: js/ui/appDisplay.js:927
+#: js/ui/appDisplay.js:929
 msgid "Frequently used applications will appear here"
 msgstr "Aplikasi yang sering dipakai akan muncul di sini"

-#: js/ui/appDisplay.js:1062
+#: js/ui/appDisplay.js:1064
 msgid "Frequent"
 msgstr "Sering"

-#: js/ui/appDisplay.js:1069
+#: js/ui/appDisplay.js:1071
 msgid "All"
 msgstr "Semua"

 #. Translators: This is the heading of a list of open windows
-#: js/ui/appDisplay.js:2452 js/ui/panel.js:75
+#: js/ui/appDisplay.js:2454 js/ui/panel.js:75
 msgid "Open Windows"
 msgstr "Buka Jendela"

-#: js/ui/appDisplay.js:2472 js/ui/panel.js:82
+#: js/ui/appDisplay.js:2474 js/ui/panel.js:82
 msgid "New Window"
 msgstr "Jendela Baru"

-#: js/ui/appDisplay.js:2483
+#: js/ui/appDisplay.js:2485
 msgid "Launch using Dedicated Graphics Card"
 msgstr "Luncurkan menggunakan Kartu Grafis Terdedikasi"

-#: js/ui/appDisplay.js:2511 js/ui/dash.js:239
+#: js/ui/appDisplay.js:2513 js/ui/dash.js:239
 msgid "Remove from Favorites"
 msgstr "Hapus dari Favorit"

-#: js/ui/appDisplay.js:2517
+#: js/ui/appDisplay.js:2519
 msgid "Add to Favorites"
 msgstr "Tambah ke Favorit"

-#: js/ui/appDisplay.js:2527 js/ui/panel.js:93
+#: js/ui/appDisplay.js:2529 js/ui/panel.js:93
 msgid "Show Details"
 msgstr "Tampilkan Rincian"

@@ -1719,7 +1738,7 @@ msgid_plural "%d new notifications"
 msgstr[0] "%d pemberitahuan baru"
 msgstr[1] "%d pemberitahuan baru"

-#: js/ui/screenShield.js:454 js/ui/status/system.js:98
+#: js/ui/screenShield.js:454 js/ui/status/system.js:103
 msgid "Lock"
 msgstr "Kunci"

@@ -2237,23 +2256,23 @@ msgstr "Matikan"
 msgid "Airplane Mode On"
 msgstr "Mode Pesawat Terbang Aktif"

-#: js/ui/status/system.js:111
+#: js/ui/status/system.js:116
 msgid "Power Off / Log Out"
 msgstr "Matikan / Log Keluar"

-#: js/ui/status/system.js:114
+#: js/ui/status/system.js:119
 msgid "Log Out"
 msgstr "Keluar"

-#: js/ui/status/system.js:126
+#: js/ui/status/system.js:131
 msgid "Switch User…"
 msgstr "Beralih Pengguna…"

-#: js/ui/status/system.js:140
+#: js/ui/status/system.js:145
 msgid "Suspend"
 msgstr "Suspensi"

-#: js/ui/status/system.js:152
+#: js/ui/status/system.js:157
 msgid "Power Off…"
 msgstr "Matikan…"

@@ -2519,11 +2538,6 @@ msgstr ""
 "Anda.\n"
 "Contohnya adalah: %s"

-#: subprojects/extensions-tool/src/command-create.c:211
-#: subprojects/extensions-tool/src/main.c:173
-msgid "Description"
-msgstr "Deskripsi"
-
 #: subprojects/extensions-tool/src/command-create.c:222
 msgid ""
 "UUID is a globally-unique identifier for your extension.\n"
@@ -2725,10 +2739,6 @@ msgstr "URL"
 msgid "Original author"
 msgstr "Penulis asli"

-#: subprojects/extensions-tool/src/main.c:185
-msgid "Version"
-msgstr "Versi"
-
 #: subprojects/extensions-tool/src/main.c:188
 msgid "State"
 msgstr "Kondisi"
@@ -2831,6 +2841,12 @@ msgstr[1] "%u Masukan"
 msgid "System Sounds"
 msgstr "Suara Sistem"

+#~ msgid "org.gnome.Extensions"
+#~ msgstr "org.gnome.Extensions"
+
+#~ msgid "Logout…"
+#~ msgstr "Keluar…"
+
 #~ msgid "Browse in Software"
 #~ msgstr "Ramban di Perangkat Lunak"

--- a/po/ja.po
+++ b/po/ja.po
--- a/po/lt.po
+++ b/po/lt.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
-"POT-Creation-Date: 2020-02-05 19:49+0000\n"
-"PO-Revision-Date: 2020-02-05 22:49+0200\n"
+"POT-Creation-Date: 2020-02-06 19:01+0000\n"
+"PO-Revision-Date: 2020-02-08 14:25+0200\n"
 "Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n"
 "Language-Team: Lietuvių <gnome-lt@lists.akl.lt>\n"
 "Language: lt\n"
@@ -49,7 +49,6 @@ msgstr "Atverti programų meniu"

 #: data/org.gnome.Extensions.desktop.in.in:4 js/extensionPrefs/main.js:218
 #: js/extensionPrefs/ui/extensions-window.ui:61
-#| msgid "Shell Extensions"
 msgid "Extensions"
 msgstr "Plėtiniai"

@@ -430,7 +429,6 @@ msgstr ""
 "Aurimas Černius <aurisc4@gmail.com>"

 #: js/extensionPrefs/main.js:219
-#| msgid "Configure GNOME Shell Extensions"
 msgid "Manage your GNOME Extensions"
 msgstr "Tvarkyti GNOME plėtinius"

@@ -491,7 +489,6 @@ msgid "Website"
 msgstr "Tinklalapis"

 #: js/extensionPrefs/ui/extension-row.ui:192
-#| msgid "Remove"
 msgid "Remove…"
 msgstr "Pašalinti…"

@@ -500,14 +497,10 @@ msgid "Help"
 msgstr "Žinynas"

 #: js/extensionPrefs/ui/extensions-window.ui:12
-#| msgid "List extensions"
 msgid "About Extensions"
 msgstr "Apie plėtinius"

 #: js/extensionPrefs/ui/extensions-window.ui:27
-#| msgid ""
-#| "Extensions can be installed through Software or <a href=\"https://"
-#| "extensions.gnome.org\">extensions.gnome.org</a>."
 msgid ""
 "To find and add extensions, visit <a href=\"https://extensions.gnome.org"
 "\">extensions.gnome.org</a>."
@@ -533,12 +526,10 @@ msgid "Manually Installed"
 msgstr "Įdiegtas rankomis"

 #: js/extensionPrefs/ui/extensions-window.ui:157
-#| msgid "Built-in Only"
 msgid "Built-In"
 msgstr "Vidinis"

 #: js/extensionPrefs/ui/extensions-window.ui:198
-#| msgid "Install Extension"
 msgid "No Installed Extensions"
 msgstr "Nėra įdiegtų plėtinių"

@@ -551,7 +542,8 @@ msgstr ""
 "esate prisijungęs prie GNOME ir bandykite vėl."

 #: js/extensionPrefs/ui/extensions-window.ui:287
-msgid "Logout…"
+#| msgid "Log Out"
+msgid "Log Out…"
 msgstr "Atsijungti…"

 #: js/gdm/authPrompt.js:184 js/gdm/authPrompt.js:237 js/gdm/authPrompt.js:468
@@ -844,44 +836,44 @@ msgstr "Atmesti prieigą"
 msgid "Grant Access"
 msgstr "Suteikti prieigą"

-#: js/ui/appDisplay.js:904
+#: js/ui/appDisplay.js:906
 msgid "Unnamed Folder"
 msgstr "Nepavadintas aplankas"

-#: js/ui/appDisplay.js:927
+#: js/ui/appDisplay.js:929
 msgid "Frequently used applications will appear here"
 msgstr "Čia bus matomos dažnai naudojamos programos"

-#: js/ui/appDisplay.js:1062
+#: js/ui/appDisplay.js:1064
 msgid "Frequent"
 msgstr "Dažnai naudojamos"

-#: js/ui/appDisplay.js:1069
+#: js/ui/appDisplay.js:1071
 msgid "All"
 msgstr "Visos"

 #. Translators: This is the heading of a list of open windows
-#: js/ui/appDisplay.js:2452 js/ui/panel.js:75
+#: js/ui/appDisplay.js:2454 js/ui/panel.js:75
 msgid "Open Windows"
 msgstr "Atverti langai"

-#: js/ui/appDisplay.js:2472 js/ui/panel.js:82
+#: js/ui/appDisplay.js:2474 js/ui/panel.js:82
 msgid "New Window"
 msgstr "Naujas langas"

-#: js/ui/appDisplay.js:2483
+#: js/ui/appDisplay.js:2485
 msgid "Launch using Dedicated Graphics Card"
 msgstr "Paleisti naudojant dedikuotą grafikos kortą"

-#: js/ui/appDisplay.js:2511 js/ui/dash.js:239
+#: js/ui/appDisplay.js:2513 js/ui/dash.js:239
 msgid "Remove from Favorites"
 msgstr "Pašalinti iš mėgstamų"

-#: js/ui/appDisplay.js:2517
+#: js/ui/appDisplay.js:2519
 msgid "Add to Favorites"
 msgstr "Pridėti prie mėgstamų"

-#: js/ui/appDisplay.js:2527 js/ui/panel.js:93
+#: js/ui/appDisplay.js:2529 js/ui/panel.js:93
 msgid "Show Details"
 msgstr "Rodyti detalią informaciją"

@@ -1445,7 +1437,6 @@ msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "Parsiųsti ir įdiegti „%s“ iš extensions.gnome.org?"

 #: js/ui/extensionSystem.js:228
-#| msgid "No Extensions Installed"
 msgid "Extension Updates Available"
 msgstr "Yra plėtinių atnaujinimų"

@@ -2856,6 +2847,9 @@ msgstr[2] "%u įvesčių"
 msgid "System Sounds"
 msgstr "Sistemos garsai"

+#~ msgid "Logout…"
+#~ msgstr "Atsijungti…"
+
 #~ msgid "Browse in Software"
 #~ msgstr "Naršyti Programinėje įrangoje"

--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -24,8 +24,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
-"POT-Creation-Date: 2020-01-28 15:54+0000\n"
-"PO-Revision-Date: 2020-01-28 18:42-0300\n"
+"POT-Creation-Date: 2020-02-06 19:01+0000\n"
+"PO-Revision-Date: 2020-02-06 20:40-0300\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
@@ -60,12 +60,13 @@ msgstr "Mostrar todos os aplicativos"
 msgid "Open the application menu"
 msgstr "Abre o menu do aplicativo"

-#: data/gnome-shell-extension-prefs.desktop.in.in:4
-#: js/extensionPrefs/main.js:209
-msgid "Shell Extensions"
-msgstr "Extensões do shell"
+#: data/org.gnome.Extensions.desktop.in.in:4 js/extensionPrefs/main.js:218
+#: js/extensionPrefs/ui/extensions-window.ui:61
+#| msgid "Shell Extensions"
+msgid "Extensions"
+msgstr "Extensões"

-#: data/gnome-shell-extension-prefs.desktop.in.in:5
+#: data/org.gnome.Extensions.desktop.in.in:7
 msgid "Configure GNOME Shell Extensions"
 msgstr "Configurar extensões do Shell do GNOME"

@@ -422,11 +423,45 @@ msgstr "Atrasar foco altera o modo do mouse até o ponteiro parar de mover"
 msgid "Network Login"
 msgstr "Sessão de Rede"

-#: js/extensionPrefs/main.js:102 js/extensionPrefs/main.js:525
+#: js/extensionPrefs/main.js:140
+#, javascript-format
+msgid "Remove “%s”?"
+msgstr "Remover “%s”?"
+
+#: js/extensionPrefs/main.js:141
+msgid ""
+"If you remove the extension, you need to return to download it if you want "
+"to enable it again"
+msgstr ""
+"Se você remover a extensão, você precisa voltar a baixá-la se você quiser "
+"habilitá-la novamente"
+
+#: js/extensionPrefs/main.js:144 js/gdm/authPrompt.js:170
+#: js/ui/audioDeviceSelection.js:57 js/ui/components/networkAgent.js:107
+#: js/ui/components/polkitAgent.js:139 js/ui/endSessionDialog.js:374
+#: js/ui/extensionDownloader.js:166 js/ui/shellMountOperation.js:376
+#: js/ui/shellMountOperation.js:386 js/ui/status/network.js:910
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: js/extensionPrefs/main.js:145
+msgid "Remove"
+msgstr "Remover"
+
+#: js/extensionPrefs/main.js:217
+msgid "translator-credits"
+msgstr "Rafael Fontenelle <rafaelff@gnome.org>"
+
+#: js/extensionPrefs/main.js:219
+#| msgid "Configure GNOME Shell Extensions"
+msgid "Manage your GNOME Extensions"
+msgstr "Gerenciar suas extensões do GNOME"
+
+#: js/extensionPrefs/main.js:261 js/extensionPrefs/ui/extensions-window.ui:222
 msgid "Something’s gone wrong"
 msgstr "Algo deu errado"

-#: js/extensionPrefs/main.js:109
+#: js/extensionPrefs/main.js:268
 msgid ""
 "We’re very sorry, but there’s been a problem: the settings for this "
 "extension can’t be displayed. We recommend that you report the issue to the "
@@ -436,39 +471,101 @@ msgstr ""
 "ser exibidas. Recomendamos que você relate o problema aos autores da "
 "extensão."

-#: js/extensionPrefs/main.js:116
+#: js/extensionPrefs/main.js:275
 msgid "Technical Details"
 msgstr "Detalhes técnicos"

-#: js/extensionPrefs/main.js:151
+#: js/extensionPrefs/main.js:310
 msgid "Copy Error"
 msgstr "Copiar erro"

-#: js/extensionPrefs/main.js:178
+#: js/extensionPrefs/main.js:337
 msgid "Homepage"
 msgstr "Site"

-#: js/extensionPrefs/main.js:179
+#: js/extensionPrefs/main.js:338
 msgid "Visit extension homepage"
 msgstr "Visita a página web da extensão"

-#: js/extensionPrefs/main.js:467
-msgid "No Extensions Installed"
+#: js/extensionPrefs/main.js:449
+#, javascript-format
+msgid "%d extension will be updated on next login."
+msgid_plural "%d extensions will be updated on next login."
+msgstr[0] "%d extensão será atualizada na próxima sessão."
+msgstr[1] "%d extensões serão atualizadas na próxima sessão."
+
+#: js/extensionPrefs/ui/extension-row.ui:100
+#: subprojects/extensions-tool/src/command-create.c:211
+#: subprojects/extensions-tool/src/main.c:173
+msgid "Description"
+msgstr "Descrição"
+
+#: js/extensionPrefs/ui/extension-row.ui:123
+#: subprojects/extensions-tool/src/main.c:185
+msgid "Version"
+msgstr "Versão"
+
+#: js/extensionPrefs/ui/extension-row.ui:151
+msgid "Author"
+msgstr "Autor"
+
+#: js/extensionPrefs/ui/extension-row.ui:175
+msgid "Website"
+msgstr "Site"
+
+#: js/extensionPrefs/ui/extension-row.ui:192
+msgid "Remove…"
+msgstr "Remover…"
+
+#: js/extensionPrefs/ui/extensions-window.ui:8
+msgid "Help"
+msgstr "Ajuda"
+
+#: js/extensionPrefs/ui/extensions-window.ui:12
+#| msgid "List extensions"
+msgid "About Extensions"
+msgstr "Sobre as Extensões"
+
+#: js/extensionPrefs/ui/extensions-window.ui:27
+#| msgid ""
+#| "Extensions can be installed through Software or <a href=\"https://"
+#| "extensions.gnome.org\">extensions.gnome.org</a>."
+msgid ""
+"To find and add extensions, visit <a href=\"https://extensions.gnome.org"
+"\">extensions.gnome.org</a>."
+msgstr ""
+"Para encontrar e adicionar extensões, visite <a href=\"https://extensions."
+"gnome.org\">extensions.gnome.org</a>."
+
+#: js/extensionPrefs/ui/extensions-window.ui:35
+msgid "Warning"
+msgstr "Aviso"
+
+#: js/extensionPrefs/ui/extensions-window.ui:46
+msgid ""
+"Extensions can cause system issues, including performance problems. If you "
+"encounter problems with your system, it is recommended to disable all "
+"extensions."
+msgstr ""
+"Extensões podem causar problemas no sistema, incluindo problemas de "
+"desempenho. Se você encontrar problemas com o seu sistema, é recomendável "
+"desativar todas as extensões."
+
+#: js/extensionPrefs/ui/extensions-window.ui:133
+msgid "Manually Installed"
+msgstr "Instalada manualmente"
+
+#: js/extensionPrefs/ui/extensions-window.ui:157
+#| msgid "Built-in Only"
+msgid "Built-In"
+msgstr "Interna"
+
+#: js/extensionPrefs/ui/extensions-window.ui:198
+#| msgid "Install Extension"
+msgid "No Installed Extensions"
 msgstr "Nenhuma extensão instalada"

-#: js/extensionPrefs/main.js:477
-msgid ""
-"Extensions can be installed through Software or <a href=\"https://extensions."
-"gnome.org\">extensions.gnome.org</a>."
-msgstr ""
-"Extensões podem ser instaladas por meio do Software ou <a href=\"https://"
-"extensions.gnome.org\">extensions.gnome.org</a>."
-
-#: js/extensionPrefs/main.js:492
-msgid "Browse in Software"
-msgstr "Navegar no Software"
-
-#: js/extensionPrefs/main.js:532
+#: js/extensionPrefs/ui/extensions-window.ui:234
 msgid ""
 "We’re very sorry, but it was not possible to get the list of installed "
 "extensions. Make sure you are logged into GNOME and try again."
@@ -476,24 +573,21 @@ msgstr ""
 "Sentimos muito, mas não foi possível obter a lista de extensões instaladas. "
 "Certifique-se de estar em uma sessão do GNOME e tente novamente."

-#: js/gdm/authPrompt.js:174 js/ui/audioDeviceSelection.js:57
-#: js/ui/components/networkAgent.js:129 js/ui/components/polkitAgent.js:138
-#: js/ui/endSessionDialog.js:374 js/ui/extensionDownloader.js:190
-#: js/ui/shellMountOperation.js:381 js/ui/shellMountOperation.js:391
-#: js/ui/status/network.js:910
-msgid "Cancel"
-msgstr "Cancelar"
+#: js/extensionPrefs/ui/extensions-window.ui:287
+#| msgid "Log Out"
+msgid "Log Out…"
+msgstr "Encerrar sessão…"

-#: js/gdm/authPrompt.js:188 js/gdm/authPrompt.js:241 js/gdm/authPrompt.js:476
+#: js/gdm/authPrompt.js:184 js/gdm/authPrompt.js:237 js/gdm/authPrompt.js:468
 msgid "Next"
 msgstr "Próximo"

-#: js/gdm/authPrompt.js:237 js/ui/shellMountOperation.js:385
+#: js/gdm/authPrompt.js:233 js/ui/shellMountOperation.js:380
 #: js/ui/unlockDialog.js:44
 msgid "Unlock"
 msgstr "Desbloquear"

-#: js/gdm/authPrompt.js:239
+#: js/gdm/authPrompt.js:235
 msgctxt "button"
 msgid "Sign In"
 msgstr "Entrar"
@@ -516,8 +610,8 @@ msgstr "(ex.: usuário ou %s)"
 #. TTLS and PEAP are actually much more complicated, but this complication
 #. is not visible here since we only care about phase2 authentication
 #. (and don't even care of which one)
-#: js/gdm/loginDialog.js:899 js/ui/components/networkAgent.js:256
-#: js/ui/components/networkAgent.js:279 js/ui/components/networkAgent.js:297
+#: js/gdm/loginDialog.js:899 js/ui/components/networkAgent.js:234
+#: js/ui/components/networkAgent.js:257 js/ui/components/networkAgent.js:275
 msgid "Username: "
 msgstr "Nome de usuário: "

@@ -595,81 +689,78 @@ msgstr "alternar usuário;trocar de usuário"

 #. Translators: A list of keywords that match the lock orientation action, separated by semicolons
 #: js/misc/systemActions.js:131
-#| msgid "lock orientation;screen;rotation"
 msgid "lock orientation;unlock orientation;screen;rotation"
 msgstr "bloqueio de orientação;desbloqueio de orientação;tela;rotação"

 #: js/misc/systemActions.js:251
-#| msgid "Lock Screen Rotation"
 msgctxt "search-result"
 msgid "Unlock Screen Rotation"
 msgstr "Desbloquear rotação de tela"

 #: js/misc/systemActions.js:252
-#| msgid "Lock Screen Rotation"
 msgctxt "search-result"
 msgid "Lock Screen Rotation"
 msgstr "Bloquear rotação de tela"

-#: js/misc/util.js:116
+#: js/misc/util.js:120
 msgid "Command not found"
 msgstr "Comando não encontrado"

 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
-#: js/misc/util.js:152
+#: js/misc/util.js:156
 msgid "Could not parse command:"
 msgstr "Não foi possível analisar comando:"

-#: js/misc/util.js:160
+#: js/misc/util.js:164
 #, javascript-format
 msgid "Execution of “%s” failed:"
 msgstr "A execução de “%s” falhou:"

-#: js/misc/util.js:177
+#: js/misc/util.js:181
 msgid "Just now"
 msgstr "Agora mesmo"

-#: js/misc/util.js:179
+#: js/misc/util.js:183
 #, javascript-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minuto atrás"
 msgstr[1] "%d minutos atrás"

-#: js/misc/util.js:183
+#: js/misc/util.js:187
 #, javascript-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d hora atrás"
 msgstr[1] "%d horas atrás"

-#: js/misc/util.js:187
+#: js/misc/util.js:191
 msgid "Yesterday"
 msgstr "Ontem"

-#: js/misc/util.js:189
+#: js/misc/util.js:193
 #, javascript-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dia atrás"
 msgstr[1] "%d dias atrás"

-#: js/misc/util.js:193
+#: js/misc/util.js:197
 #, javascript-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d semana atrás"
 msgstr[1] "%d semanas atrás"

-#: js/misc/util.js:197
+#: js/misc/util.js:201
 #, javascript-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d mês atrás"
 msgstr[1] "%d meses atrás"

-#: js/misc/util.js:200
+#: js/misc/util.js:204
 #, javascript-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -677,20 +768,20 @@ msgstr[0] "%d ano atrás"
 msgstr[1] "%d anos atrás"

 #. Translators: Time in 24h format
-#: js/misc/util.js:233
+#: js/misc/util.js:237
 msgid "%H∶%M"
 msgstr "%H∶%M"

 #. Translators: this is the word "Yesterday" followed by a
 #. time string in 24h format. i.e. "Yesterday, 14:30"
-#: js/misc/util.js:239
+#: js/misc/util.js:243
 #, no-c-format
 msgid "Yesterday, %H∶%M"
 msgstr "Ontem, %H∶%M"

 #. Translators: this is the week day name followed by a time
 #. string in 24h format. i.e. "Monday, 14:30"
-#: js/misc/util.js:245
+#: js/misc/util.js:249
 #, no-c-format
 msgid "%A, %H∶%M"
 msgstr "%A, %H∶%M"
@@ -698,7 +789,7 @@ msgstr "%A, %H∶%M"
 #. Translators: this is the month name and day number
 #. followed by a time string in 24h format.
 #. i.e. "May 25, 14:30"
-#: js/misc/util.js:251
+#: js/misc/util.js:255
 #, no-c-format
 msgid "%B %-d, %H∶%M"
 msgstr "%-d de %B, %H∶%M"
@@ -706,7 +797,7 @@ msgstr "%-d de %B, %H∶%M"
 #. Translators: this is the month name, day number, year
 #. number followed by a time string in 24h format.
 #. i.e. "May 25 2012, 14:30"
-#: js/misc/util.js:257
+#: js/misc/util.js:261
 #, no-c-format
 msgid "%B %-d %Y, %H∶%M"
 msgstr "%-d de %B de %Y, %H∶%M"
@@ -714,20 +805,20 @@ msgstr "%-d de %B de %Y, %H∶%M"
 #. Show only the time if date is on today
 #. eslint-disable-line no-lonely-if
 #. Translators: Time in 12h format
-#: js/misc/util.js:262
+#: js/misc/util.js:266
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"

 #. Translators: this is the word "Yesterday" followed by a
 #. time string in 12h format. i.e. "Yesterday, 2:30 pm"
-#: js/misc/util.js:268
+#: js/misc/util.js:272
 #, no-c-format
 msgid "Yesterday, %l∶%M %p"
 msgstr "Ontem, %l∶%M %p"

 #. Translators: this is the week day name followed by a time
 #. string in 12h format. i.e. "Monday, 2:30 pm"
-#: js/misc/util.js:274
+#: js/misc/util.js:278
 #, no-c-format
 msgid "%A, %l∶%M %p"
 msgstr "%A, %l∶%M %p"
@@ -735,7 +826,7 @@ msgstr "%A, %l∶%M %p"
 #. Translators: this is the month name and day number
 #. followed by a time string in 12h format.
 #. i.e. "May 25, 2:30 pm"
-#: js/misc/util.js:280
+#: js/misc/util.js:284
 #, no-c-format
 msgid "%B %-d, %l∶%M %p"
 msgstr "%-d de %B, %l∶%M %p"
@@ -743,17 +834,17 @@ msgstr "%-d de %B, %l∶%M %p"
 #. Translators: this is the month name, day number, year
 #. number followed by a time string in 12h format.
 #. i.e. "May 25 2012, 2:30 pm"
-#: js/misc/util.js:286
+#: js/misc/util.js:290
 #, no-c-format
 msgid "%B %-d %Y, %l∶%M %p"
 msgstr "%-d de %B de %Y, %l∶%M %p"

 #. TRANSLATORS: this is the title of the wifi captive portal login window
-#: js/portalHelper/main.js:40
+#: js/portalHelper/main.js:42
 msgid "Hotspot Login"
 msgstr "Autenticação de ponto de acesso"

-#: js/portalHelper/main.js:86
+#: js/portalHelper/main.js:88
 msgid ""
 "Your connection to this hotspot login is not secure. Passwords or other "
 "information you enter on this page can be viewed by people nearby."
@@ -772,44 +863,44 @@ msgstr "Negar acesso"
 msgid "Grant Access"
 msgstr "Conceder acesso"

-#: js/ui/appDisplay.js:904
+#: js/ui/appDisplay.js:906
 msgid "Unnamed Folder"
 msgstr "Pasta sem nome"

-#: js/ui/appDisplay.js:927
+#: js/ui/appDisplay.js:929
 msgid "Frequently used applications will appear here"
 msgstr "Aplicativos usados frequentemente vão aparecer aqui"

-#: js/ui/appDisplay.js:1062
+#: js/ui/appDisplay.js:1064
 msgid "Frequent"
 msgstr "Frequente"

-#: js/ui/appDisplay.js:1069
+#: js/ui/appDisplay.js:1071
 msgid "All"
 msgstr "Todos"

 #. Translators: This is the heading of a list of open windows
-#: js/ui/appDisplay.js:2452 js/ui/panel.js:75
+#: js/ui/appDisplay.js:2454 js/ui/panel.js:75
 msgid "Open Windows"
 msgstr "Janelas abertas"

-#: js/ui/appDisplay.js:2472 js/ui/panel.js:82
+#: js/ui/appDisplay.js:2474 js/ui/panel.js:82
 msgid "New Window"
 msgstr "Nova janela"

-#: js/ui/appDisplay.js:2483
+#: js/ui/appDisplay.js:2485
 msgid "Launch using Dedicated Graphics Card"
 msgstr "Inicia usando placa de vídeo dedicada"

-#: js/ui/appDisplay.js:2511 js/ui/dash.js:239
+#: js/ui/appDisplay.js:2513 js/ui/dash.js:239
 msgid "Remove from Favorites"
 msgstr "Remover dos favoritos"

-#: js/ui/appDisplay.js:2517
+#: js/ui/appDisplay.js:2519
 msgid "Add to Favorites"
 msgstr "Adicionar aos favoritos"

-#: js/ui/appDisplay.js:2527 js/ui/panel.js:93
+#: js/ui/appDisplay.js:2529 js/ui/panel.js:93
 msgid "Show Details"
 msgstr "Mostrar detalhes"

@@ -1027,55 +1118,48 @@ msgstr "A versão do udisks instalado não possui suporte à configuração do P
 msgid "Open with %s"
 msgstr "Abrir com %s"

-#: js/ui/components/keyring.js:70 js/ui/components/polkitAgent.js:278
-msgid "Password:"
-msgstr "Senha:"
-
-#: js/ui/components/keyring.js:104
-msgid "Type again:"
-msgstr "Digite novamente:"
-
-#: js/ui/components/networkAgent.js:115
+#: js/ui/components/networkAgent.js:89
 msgid ""
 "Alternatively you can connect by pushing the “WPS” button on your router."
 msgstr ""
 "Alternativamente, você pode conectar pressionando o botão “WPS” em seu "
 "roteador."

-#: js/ui/components/networkAgent.js:123 js/ui/status/network.js:223
+#: js/ui/components/networkAgent.js:101 js/ui/status/network.js:223
 #: js/ui/status/network.js:314 js/ui/status/network.js:913
 msgid "Connect"
 msgstr "Conectar"

 #. Cisco LEAP
-#: js/ui/components/networkAgent.js:224 js/ui/components/networkAgent.js:236
-#: js/ui/components/networkAgent.js:260 js/ui/components/networkAgent.js:281
-#: js/ui/components/networkAgent.js:301 js/ui/components/networkAgent.js:311
+#: js/ui/components/networkAgent.js:202 js/ui/components/networkAgent.js:214
+#: js/ui/components/networkAgent.js:238 js/ui/components/networkAgent.js:259
+#: js/ui/components/networkAgent.js:279 js/ui/components/networkAgent.js:289
 msgid "Password: "
 msgstr "Senha: "

 #. static WEP
-#: js/ui/components/networkAgent.js:229
+#: js/ui/components/networkAgent.js:207
 msgid "Key: "
 msgstr "Chave: "

-#: js/ui/components/networkAgent.js:264 js/ui/components/networkAgent.js:287
+#: js/ui/components/networkAgent.js:242 js/ui/components/networkAgent.js:265
 msgid "Private key password: "
 msgstr "Senha da chave privada: "

-#: js/ui/components/networkAgent.js:285
+#: js/ui/components/networkAgent.js:263
 msgid "Identity: "
 msgstr "Identidade: "

-#: js/ui/components/networkAgent.js:299
+#: js/ui/components/networkAgent.js:277
 msgid "Service: "
 msgstr "Serviço: "

-#: js/ui/components/networkAgent.js:328 js/ui/components/networkAgent.js:703
-msgid "Authentication required by wireless network"
-msgstr "Autenticação requisitada pela rede sem fio"
+#: js/ui/components/networkAgent.js:306 js/ui/components/networkAgent.js:334
+#: js/ui/components/networkAgent.js:681 js/ui/components/networkAgent.js:702
+msgid "Authentication required"
+msgstr "Autenticação necessária"

-#: js/ui/components/networkAgent.js:329 js/ui/components/networkAgent.js:704
+#: js/ui/components/networkAgent.js:307 js/ui/components/networkAgent.js:682
 #, javascript-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
@@ -1084,58 +1168,54 @@ msgstr ""
 "Senhas ou chaves criptografadas são necessárias para acessar a rede sem fio "
 "“%s”."

-#: js/ui/components/networkAgent.js:333 js/ui/components/networkAgent.js:708
+#: js/ui/components/networkAgent.js:311 js/ui/components/networkAgent.js:686
 msgid "Wired 802.1X authentication"
 msgstr "Autenticação 802.1X cabeada"

-#: js/ui/components/networkAgent.js:335
+#: js/ui/components/networkAgent.js:313
 msgid "Network name: "
 msgstr "Nome da rede: "

-#: js/ui/components/networkAgent.js:340 js/ui/components/networkAgent.js:712
+#: js/ui/components/networkAgent.js:318 js/ui/components/networkAgent.js:690
 msgid "DSL authentication"
 msgstr "Autenticação DSL"

-#: js/ui/components/networkAgent.js:347 js/ui/components/networkAgent.js:717
+#: js/ui/components/networkAgent.js:325 js/ui/components/networkAgent.js:695
 msgid "PIN code required"
 msgstr "Código PIN requisitado"

-#: js/ui/components/networkAgent.js:348 js/ui/components/networkAgent.js:718
+#: js/ui/components/networkAgent.js:326 js/ui/components/networkAgent.js:696
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "O código PIN é necessário para o dispositivo móvel de banda larga"

-#: js/ui/components/networkAgent.js:349
+#: js/ui/components/networkAgent.js:327
 msgid "PIN: "
 msgstr "PIN: "

-#: js/ui/components/networkAgent.js:356 js/ui/components/networkAgent.js:724
-msgid "Mobile broadband network password"
-msgstr "Senha da rede de banda larga móvel"
-
-#: js/ui/components/networkAgent.js:357 js/ui/components/networkAgent.js:709
-#: js/ui/components/networkAgent.js:713 js/ui/components/networkAgent.js:725
-#: js/ui/components/networkAgent.js:729
+#: js/ui/components/networkAgent.js:335 js/ui/components/networkAgent.js:687
+#: js/ui/components/networkAgent.js:691 js/ui/components/networkAgent.js:703
+#: js/ui/components/networkAgent.js:707
 #, javascript-format
 msgid "A password is required to connect to “%s”."
 msgstr "Uma senha é necessária para se conectar a “%s”."

-#: js/ui/components/networkAgent.js:692 js/ui/status/network.js:1688
+#: js/ui/components/networkAgent.js:670 js/ui/status/network.js:1688
 msgid "Network Manager"
 msgstr "Gerenciador de rede"

-#: js/ui/components/networkAgent.js:728
+#: js/ui/components/networkAgent.js:706
 msgid "VPN password"
 msgstr "Senha de VPN"

-#: js/ui/components/polkitAgent.js:41
+#: js/ui/components/polkitAgent.js:39
 msgid "Authentication Required"
 msgstr "Autenticação necessária"

-#: js/ui/components/polkitAgent.js:81
+#: js/ui/components/polkitAgent.js:80
 msgid "Administrator"
 msgstr "Administrador"

-#: js/ui/components/polkitAgent.js:141
+#: js/ui/components/polkitAgent.js:142
 msgid "Authenticate"
 msgstr "Autenticação"

@@ -1143,10 +1223,15 @@ msgstr "Autenticação"
 #. * requested authentication was not gained; this can happen
 #. * because of an authentication error (like invalid password),
 #. * for instance.
-#: js/ui/components/polkitAgent.js:259 js/ui/shellMountOperation.js:365
+#: js/ui/components/polkitAgent.js:254 js/ui/shellMountOperation.js:402
 msgid "Sorry, that didn’t work. Please try again."
 msgstr "Desculpe, isto não funcionou. Por favor, tente novamente."

+#: js/ui/components/polkitAgent.js:277 js/ui/shellMountOperation.js:326
+#| msgid "Remember Password"
+msgid "Enter Password…"
+msgstr "Lembrar senha…"
+
 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
 #: js/ui/components/telepathyClient.js:787
@@ -1362,34 +1447,39 @@ msgstr "%s (remoto)"
 msgid "%s (console)"
 msgstr "%s (console)"

-#: js/ui/extensionDownloader.js:194
+#: js/ui/extensionDownloader.js:170
 msgid "Install"
 msgstr "Instalar"

-#: js/ui/extensionDownloader.js:200
-#| msgid "Uninstall extension"
+#: js/ui/extensionDownloader.js:176
 msgid "Install Extension"
 msgstr "Instalar extensão"

-#: js/ui/extensionDownloader.js:201
+#: js/ui/extensionDownloader.js:177
 #, javascript-format
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "Baixar e instalar “%s” de extensions.gnome.org?"

+#: js/ui/extensionSystem.js:228
+#| msgid "No Extensions Installed"
+msgid "Extension Updates Available"
+msgstr "Atualizações de extensões disponíveis"
+
+#: js/ui/extensionSystem.js:229
+msgid "Extension updates are ready to be installed."
+msgstr "Atualizações de extensões estão prontas para serem instaladas."
+
 #: js/ui/inhibitShortcutsDialog.js:79
-#| msgid "%s wants to inhibit shortcuts"
 msgid "Allow inhibiting shortcuts"
 msgstr "Permitir inibir atalhos"

 #. Translators: %s is an application name like "Settings"
 #: js/ui/inhibitShortcutsDialog.js:82
 #, javascript-format
-#| msgid "Application wants to inhibit shortcuts"
 msgid "The application %s wants to inhibit shortcuts"
 msgstr "O aplicativo %s deseja inibir atalhos"

 #: js/ui/inhibitShortcutsDialog.js:83
-#| msgid "Application wants to inhibit shortcuts"
 msgid "An application wants to inhibit shortcuts"
 msgstr "Um aplicativo deseja inibir atalhos"

@@ -1638,12 +1728,10 @@ msgid "Top Bar"
 msgstr "Barra superior"

 #: js/ui/runDialog.js:58
-#| msgid "Enter a Command"
 msgid "Run a Command"
 msgstr "Executar um comando"

 #: js/ui/runDialog.js:73
-#| msgid "Press Esc to exit"
 msgid "Press ESC to close"
 msgstr "Pressione Esc para fechar"

@@ -1675,7 +1763,7 @@ msgid_plural "%d new notifications"
 msgstr[0] "%d nova notificação"
 msgstr[1] "%d novas notificações"

-#: js/ui/screenShield.js:454 js/ui/status/system.js:98
+#: js/ui/screenShield.js:454 js/ui/status/system.js:103
 msgid "Lock"
 msgstr "Bloquear"

@@ -1733,20 +1821,20 @@ msgstr "Ocultar texto"
 msgid "Caps lock is on."
 msgstr "Caps lock está ligado."

-#: js/ui/shellMountOperation.js:287
+#: js/ui/shellMountOperation.js:285
 msgid "Hidden Volume"
 msgstr "Volume oculto"

-#: js/ui/shellMountOperation.js:290
+#: js/ui/shellMountOperation.js:288
 msgid "Windows System Volume"
 msgstr "Volume de sistema Windows"

-#: js/ui/shellMountOperation.js:293
+#: js/ui/shellMountOperation.js:291
 msgid "Uses Keyfiles"
 msgstr "Usa arquivos de chave"

 #. Translators: %s is the Disks application
-#: js/ui/shellMountOperation.js:299
+#: js/ui/shellMountOperation.js:298
 #, javascript-format
 msgid ""
 "To unlock a volume that uses keyfiles, use the <i>%s</i> utility instead."
@@ -1755,35 +1843,32 @@ msgstr ""
 "%s</i>."

 #: js/ui/shellMountOperation.js:306
-msgid "PIM Number"
-msgstr "Número PIM"
+#| msgid "PIM Number"
+msgid "Enter PIM Number…"
+msgstr "Insira um número PIM…"

-#: js/ui/shellMountOperation.js:325
-msgid "The PIM must be a number or empty."
-msgstr "O PIM deve ser um número ou vazio."
-
-#: js/ui/shellMountOperation.js:336
-msgid "Password"
-msgstr "Senha"
-
-#: js/ui/shellMountOperation.js:372
+#: js/ui/shellMountOperation.js:365
 msgid "Remember Password"
 msgstr "Lembrar senha"

 #. Translators: %s is the Disks application
-#: js/ui/shellMountOperation.js:396
+#: js/ui/shellMountOperation.js:391
 #, javascript-format
 msgid "Open %s"
 msgstr "Abrir o %s"

+#: js/ui/shellMountOperation.js:423
+msgid "The PIM must be a number or empty."
+msgstr "O PIM deve ser um número ou vazio."
+
 #. Translators: %s is the Disks application
-#: js/ui/shellMountOperation.js:468
+#: js/ui/shellMountOperation.js:469
 #, javascript-format
 msgid "Unable to start %s"
 msgstr "Não foi possível iniciar o %s"

 #. Translators: %s is the Disks application
-#: js/ui/shellMountOperation.js:470
+#: js/ui/shellMountOperation.js:471
 #, javascript-format
 msgid "Couldn’t find the %s application"
 msgstr "Não foi possível localizar o aplicativo %s"
@@ -1919,7 +2004,6 @@ msgstr "Permitir acesso a localização"
 #. Translators: %s is an application name
 #: js/ui/status/location.js:357
 #, javascript-format
-#| msgid "Give %s access to your location?"
 msgid "The app %s wants to access your location"
 msgstr "O aplicativo %s deseja acesso a sua localização"

@@ -2201,23 +2285,23 @@ msgstr "Desativar"
 msgid "Airplane Mode On"
 msgstr "Modo avião ligado"

-#: js/ui/status/system.js:111
+#: js/ui/status/system.js:116
 msgid "Power Off / Log Out"
 msgstr "Desligar / encerrar sessão"

-#: js/ui/status/system.js:114
+#: js/ui/status/system.js:119
 msgid "Log Out"
 msgstr "Encerrar sessão"

-#: js/ui/status/system.js:126
+#: js/ui/status/system.js:131
 msgid "Switch User…"
 msgstr "Alternar usuário…"

-#: js/ui/status/system.js:140
+#: js/ui/status/system.js:145
 msgid "Suspend"
 msgstr "Suspender"

-#: js/ui/status/system.js:152
+#: js/ui/status/system.js:157
 msgid "Power Off…"
 msgstr "Desligar…"

@@ -2316,22 +2400,24 @@ msgstr "“%s” está pronto"

 # Título de janela de confirmação; Se grande demais, pode ser exibida com "..."
 # Vide: https://bugzilla.gnome.org/show_bug.cgi?id=786331
-#: js/ui/windowManager.js:54
-msgid "Do you want to keep these display settings?"
-msgstr "Deseja manter essas configurações da tela?"
+#. Translators: This string should be shorter than 30 characters
+#: js/ui/windowManager.js:55
+#| msgid "Do you want to keep these display settings?"
+msgid "Keep these display settings?"
+msgstr "Manter essas configurações da tela?"

 #. Translators: this and the following message should be limited in length,
 #. to avoid ellipsizing the labels.
 #.
-#: js/ui/windowManager.js:68
+#: js/ui/windowManager.js:64
 msgid "Revert Settings"
 msgstr "Reverter configurações"

-#: js/ui/windowManager.js:71
+#: js/ui/windowManager.js:67
 msgid "Keep Changes"
 msgstr "Manter alterações"

-#: js/ui/windowManager.js:89
+#: js/ui/windowManager.js:85
 #, javascript-format
 msgid "Settings changes will revert in %d second"
 msgid_plural "Settings changes will revert in %d seconds"
@@ -2340,7 +2426,7 @@ msgstr[1] "Alterações nas configurações serão revertidas em %d segundos"

 #. Translators: This represents the size of a window. The first number is
 #. * the width of the window and the second is the height.
-#: js/ui/windowManager.js:546
+#: js/ui/windowManager.js:542
 #, javascript-format
 msgid "%d × %d"
 msgstr "%d × %d"
@@ -2485,11 +2571,6 @@ msgstr ""
 "Descrição é uma explicação uma só frase do que sua extensão faz.\n"
 "Exemplos são: %s"

-#: subprojects/extensions-tool/src/command-create.c:211
-#: subprojects/extensions-tool/src/main.c:173
-msgid "Description"
-msgstr "Descrição"
-
 #: subprojects/extensions-tool/src/command-create.c:222
 msgid ""
 "UUID is a globally-unique identifier for your extension.\n"
@@ -2692,10 +2773,6 @@ msgstr "URL"
 msgid "Original author"
 msgstr "Autor original"

-#: subprojects/extensions-tool/src/main.c:185
-msgid "Version"
-msgstr "Versão"
-
 #: subprojects/extensions-tool/src/main.c:188
 msgid "State"
 msgstr "Estado"
@@ -2798,6 +2875,24 @@ msgstr[1] "%u entradas"
 msgid "System Sounds"
 msgstr "Sons do sistema"

+#~ msgid "Browse in Software"
+#~ msgstr "Navegar no Software"
+
+#~ msgid "Password:"
+#~ msgstr "Senha:"
+
+#~ msgid "Type again:"
+#~ msgstr "Digite novamente:"
+
+#~ msgid "Authentication required by wireless network"
+#~ msgstr "Autenticação requisitada pela rede sem fio"
+
+#~ msgid "Mobile broadband network password"
+#~ msgstr "Senha da rede de banda larga móvel"
+
+#~ msgid "Password"
+#~ msgstr "Senha"
+
 #~ msgctxt "search-result"
 #~ msgid "Lock Orientation"
 #~ msgstr "Bloquear orientação"
@@ -2913,9 +3008,6 @@ msgstr "Sons do sistema"
 #~ msgstr[0] "%d dispositivo conectado"
 #~ msgstr[1] "%d dispositivos conectados"

-#~ msgid "Authentication required"
-#~ msgstr "Autenticação necessária"
-
 # UPS significa uninterruptible power supply, mas no Brasil vejo usando mais
 # "No-break", que é a mesma coisa, então optei pela segunda. -- Rafael Fontenelle
 #~ msgid "UPS"
--- a/po/sv.po
+++ b/po/sv.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
-"POT-Creation-Date: 2020-02-04 18:00+0000\n"
-"PO-Revision-Date: 2020-02-05 18:20+0100\n"
+"POT-Creation-Date: 2020-02-06 19:01+0000\n"
+"PO-Revision-Date: 2020-02-06 23:56+0100\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -51,11 +51,7 @@ msgstr "Öppna programmenyn"
 msgid "Extensions"
 msgstr "Tillägg"

-#: data/org.gnome.Extensions.desktop.in.in:5
-msgid "org.gnome.Extensions"
-msgstr "org.gnome.Extensions"
-
-#: data/org.gnome.Extensions.desktop.in.in:6
+#: data/org.gnome.Extensions.desktop.in.in:7
 msgid "Configure GNOME Shell Extensions"
 msgstr "Konfigurera tillägg för GNOME-skal"

@@ -474,6 +470,29 @@ msgid_plural "%d extensions will be updated on next login."
 msgstr[0] "%d inlägg kommer att uppdateras vid nästa inloggning."
 msgstr[1] "%d inlägg kommer att uppdateras vid nästa inloggning."

+#: js/extensionPrefs/ui/extension-row.ui:100
+#: subprojects/extensions-tool/src/command-create.c:211
+#: subprojects/extensions-tool/src/main.c:173
+msgid "Description"
+msgstr "Beskrivning"
+
+#: js/extensionPrefs/ui/extension-row.ui:123
+#: subprojects/extensions-tool/src/main.c:185
+msgid "Version"
+msgstr "Version"
+
+#: js/extensionPrefs/ui/extension-row.ui:151
+msgid "Author"
+msgstr "Upphovsman"
+
+#: js/extensionPrefs/ui/extension-row.ui:175
+msgid "Website"
+msgstr "Webbplats"
+
+#: js/extensionPrefs/ui/extension-row.ui:192
+msgid "Remove…"
+msgstr "Ta bort…"
+
 #: js/extensionPrefs/ui/extensions-window.ui:8
 msgid "Help"
 msgstr "Hjälp"
@@ -524,7 +543,7 @@ msgstr ""
 "tillägg. Säkerställ att du är inloggad i GNOME och försök igen."

 #: js/extensionPrefs/ui/extensions-window.ui:287
-msgid "Logout…"
+msgid "Log Out…"
 msgstr "Logga ut…"

 #: js/gdm/authPrompt.js:184 js/gdm/authPrompt.js:237 js/gdm/authPrompt.js:468
@@ -814,44 +833,44 @@ msgstr "Neka åtkomst"
 msgid "Grant Access"
 msgstr "Bevilja åtkomst"

-#: js/ui/appDisplay.js:904
+#: js/ui/appDisplay.js:906
 msgid "Unnamed Folder"
 msgstr "Namnlös mapp"

-#: js/ui/appDisplay.js:927
+#: js/ui/appDisplay.js:929
 msgid "Frequently used applications will appear here"
 msgstr "Ofta använda program kommer visas här"

-#: js/ui/appDisplay.js:1062
+#: js/ui/appDisplay.js:1064
 msgid "Frequent"
 msgstr "Ofta använda"

-#: js/ui/appDisplay.js:1069
+#: js/ui/appDisplay.js:1071
 msgid "All"
 msgstr "Alla"

 #. Translators: This is the heading of a list of open windows
-#: js/ui/appDisplay.js:2452 js/ui/panel.js:75
+#: js/ui/appDisplay.js:2454 js/ui/panel.js:75
 msgid "Open Windows"
 msgstr "Öppna fönster"

-#: js/ui/appDisplay.js:2472 js/ui/panel.js:82
+#: js/ui/appDisplay.js:2474 js/ui/panel.js:82
 msgid "New Window"
 msgstr "Nytt fönster"

-#: js/ui/appDisplay.js:2483
+#: js/ui/appDisplay.js:2485
 msgid "Launch using Dedicated Graphics Card"
 msgstr "Kör med diskret grafikkort"

-#: js/ui/appDisplay.js:2511 js/ui/dash.js:239
+#: js/ui/appDisplay.js:2513 js/ui/dash.js:239
 msgid "Remove from Favorites"
 msgstr "Ta bort från favoriter"

-#: js/ui/appDisplay.js:2517
+#: js/ui/appDisplay.js:2519
 msgid "Add to Favorites"
 msgstr "Lägg till som favorit"

-#: js/ui/appDisplay.js:2527 js/ui/panel.js:93
+#: js/ui/appDisplay.js:2529 js/ui/panel.js:93
 msgid "Show Details"
 msgstr "Visa detaljer"

@@ -2511,11 +2530,6 @@ msgstr ""
 "Beskrivning är en ensam mening som förklarar vad ditt tillägg gör.\n"
 "Exempel: %s"

-#: subprojects/extensions-tool/src/command-create.c:211
-#: subprojects/extensions-tool/src/main.c:173
-msgid "Description"
-msgstr "Beskrivning"
-
 #: subprojects/extensions-tool/src/command-create.c:222
 msgid ""
 "UUID is a globally-unique identifier for your extension.\n"
@@ -2718,10 +2732,6 @@ msgstr "URL"
 msgid "Original author"
 msgstr "Ursprunglig upphovsman"

-#: subprojects/extensions-tool/src/main.c:185
-msgid "Version"
-msgstr "Version"
-
 #: subprojects/extensions-tool/src/main.c:188
 msgid "State"
 msgstr "Tillstånd"
@@ -2824,6 +2834,12 @@ msgstr[1] "%u ingångar"
 msgid "System Sounds"
 msgstr "Systemljud"

+#~ msgid "org.gnome.Extensions"
+#~ msgstr "org.gnome.Extensions"
+
+#~ msgid "Logout…"
+#~ msgstr "Logga ut…"
+
 #~ msgid "Browse in Software"
 #~ msgstr "Bläddra i Programvara"

--- a/po/tr.po
+++ b/po/tr.po
--- a/subprojects/extensions-tool/man/gnome-extensions.txt
+++ b/subprojects/extensions-tool/man/gnome-extensions.txt
@@ -96,6 +96,9 @@ Displays a list of installed extensions.
  *--prefs*;;
    Only include extensions with preferences

+  *--updates*;;
+    Only include extensions with pending updates
+
  *-d*;;
  *--details*;;
    Show some extra information for each extension
--- a/subprojects/extensions-tool/src/command-list.c
+++ b/subprojects/extensions-tool/src/command-list.c
@@ -32,7 +32,8 @@ typedef enum {
  LIST_FLAGS_SYSTEM   = 1 << 1,
  LIST_FLAGS_ENABLED  = 1 << 2,
  LIST_FLAGS_DISABLED = 1 << 3,
-  LIST_FLAGS_NO_PREFS = 1 << 4
+  LIST_FLAGS_NO_PREFS = 1 << 4,
+  LIST_FLAGS_NO_UPDATES = 1 << 5,
 } ListFilterFlags;

 static gboolean
@@ -69,11 +70,13 @@ list_extensions (ListFilterFlags filter, DisplayFormat format)
      g_autoptr (GVariantDict) info = NULL;
      double type, state;
      gboolean has_prefs;
+      gboolean has_update;

      info = g_variant_dict_new (value);
      g_variant_dict_lookup (info, "type", "d", &type);
      g_variant_dict_lookup (info, "state", "d", &state);
      g_variant_dict_lookup (info, "hasPrefs", "b", &has_prefs);
+      g_variant_dict_lookup (info, "hasUpdate", "b", &has_update);

      if (type == TYPE_USER && (filter & LIST_FLAGS_USER) == 0)
        continue;
@@ -90,6 +93,9 @@ list_extensions (ListFilterFlags filter, DisplayFormat format)
      if (!has_prefs && (filter & LIST_FLAGS_NO_PREFS) == 0)
        continue;

+      if (!has_update && (filter & LIST_FLAGS_NO_UPDATES) == 0)
+        continue;
+
      if (needs_newline)
        g_print ("\n");

@@ -112,6 +118,7 @@ handle_list (int argc, char *argv[], gboolean do_help)
  gboolean enabled = FALSE;
  gboolean disabled = FALSE;
  gboolean has_prefs = FALSE;
+  gboolean has_updates = FALSE;
  GOptionEntry entries[] = {
    { .long_name = "user",
      .arg = G_OPTION_ARG_NONE, .arg_data = &user,
@@ -128,6 +135,9 @@ handle_list (int argc, char *argv[], gboolean do_help)
    { .long_name = "prefs",
      .arg = G_OPTION_ARG_NONE, .arg_data = &has_prefs,
      .description = _("Show extensions with preferences") },
+    { .long_name = "updates",
+      .arg = G_OPTION_ARG_NONE, .arg_data = &has_updates,
+      .description = _("Show extensions with updates") },
    { .long_name = "details", .short_name = 'd',
      .arg = G_OPTION_ARG_NONE, .arg_data = &details,
      .description = _("Print extension details") },
@@ -174,6 +184,9 @@ handle_list (int argc, char *argv[], gboolean do_help)
  if (!has_prefs)
    flags |= LIST_FLAGS_NO_PREFS;

+  if (!has_updates)
+    flags |= LIST_FLAGS_NO_UPDATES;
+
  return list_extensions (flags, details ? DISPLAY_DETAILED
                                         : DISPLAY_ONELINE) ? 0 : 2;
 }
Author	SHA1	Message	Date
Florian Müllner	224ab2e543	extensions-tool: Add option to list updates Now that we support extension updates, it may be useful to list pending updates from the command line. It's easy enough to support, so add a corresponding option to the list command. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/988	2020-02-10 22:43:00 +00:00
Georges Basile Stavracas Neto	dee738e24f	background: Remove noise texture Use the plain background color. Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/2174 https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:52 +00:00
Georges Basile Stavracas Neto	84c7890917	screenShield: Remove lock screen group from Crtl-Alt-Tab manager There is nothing else to be focused in the lock screen itself -- the top bar is already handled elsewhere, and the dialog manages itself now. Remove the lock screen group from the Ctrl-Alt-Tab manager. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:52 +00:00
Georges Basile Stavracas Neto	fd484099ae	screenShield: Cleanup _ensureUnlockDialog Just like on ScreenShield.activate(), we can just ensure the unlock screen on ScreenShield.showDialog(). https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:52 +00:00
Georges Basile Stavracas Neto	727c84251d	screenShield: Rework key focus management Instead of always grabbing key focus for the screen lock group, do that for the unlock dialog itself. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:52 +00:00
Georges Basile Stavracas Neto	37e55df298	unlockDialog: Create auth prompt on demand AuthPrompt is the set of actors that contain the user avatar, the username, and the password entry. With the removal of the screen shield, the unlock dialog (be it UnlockDialog or the LoginDialog) is always created, and in the case of UnlockDialog, so is the auth prompt. This is problematic, though, since for passwordless accounts, the simple act of creating AuthPrompt authenticates the user, and lifts the lock screen. Create the AuthPrompt on demand in UnlockDialog. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:52 +00:00
Georges Basile Stavracas Neto	2644f62318	unlockDialog: Add .critical CSS class to critical notifications As per the latest lock screen mockups, critical notifications must have a more prominent, solid color. Add a .critical style class to critical notification bubbles, and make them darker. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:52 +00:00
Georges Basile Stavracas Neto	893bde0ca1	theme: Adjust style of lock screen notifications https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:52 +00:00
Georges Basile Stavracas Neto	bd0bf3d3d0	unlockDialog: Line notification labels horizontally https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:52 +00:00
Georges Basile Stavracas Neto	05c918dc1a	unlockDialog: Use just the counter to format notifications https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:52 +00:00
Georges Basile Stavracas Neto	3651cb2047	unlockDialog: Show clock when canceling or failing auth There is still a problem of focus not going to the entry after the first cancel, but it seems to work fine otherwise. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:52 +00:00
Georges Basile Stavracas Neto	b9c7631a55	unlockDialog: Toggle between clock and auth prompt Toggle between them when (1) tapping anythere on the screen, and (2) pressing any key. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:52 +00:00
Georges Basile Stavracas Neto	b59c9c6946	unlockDialog: Move auth prompt and clock to a ShellStack We will toggle between each other in the next commit, so add both to a ShellStack. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:52 +00:00
Georges Basile Stavracas Neto	f02313c1c6	screenShield: Remove key press event handler https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:52 +00:00
Georges Basile Stavracas Neto	6493789bc9	unlockDialog: Introduce UnlockDialogLayout This is the layout manager responsible for ensuring that the clock is always at the third of the screen height, and the notifications can push it to above. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:52 +00:00
Georges Basile Stavracas Neto	4081b97462	theme: Adjust lock screen clock fonts These values were decided during the GNOME Shell Hackfest, but they're still subject to changes. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:52 +00:00
Georges Basile Stavracas Neto	c20451c2e7	sessionMode: Remove lock-screen mode Now that the screen shield is gone (at least, as it used to be), the corresponding session mode is not necessary anymore as well. Remove the 'lock-screen' session mode, and the corresponding CSS. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:52 +00:00
Georges Basile Stavracas Neto	16dcb1ac15	screenShield: Move lock shield below dialog Pretty much what the commit title says. This gives the lock shield actor another role: instead of being the interactive screen shield, make it the invisible actor that prevents interacting with windows while the unlock dialog is sliding down. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:52 +00:00
Georges Basile Stavracas Neto	c1ee656c35	screenShield: Only animate the unlock dialog Remove the slide-up-down animation from the lock shield. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:52 +00:00
Georges Basile Stavracas Neto	cd09144069	screenShield: Rename _liftShield to _activateDialog Lifting the shield is now what happens after successfully logging in, not before. Now, what we do is activate the dialog before logging in. Rename the method to reflect that. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:52 +00:00
Georges Basile Stavracas Neto	7851069d9c	screenShield: Activate dialog when necessary Activating a dialog is slightly different from opening it; the former is about showing the user authentication widgetry, while the latter is about creating it and pre-allocating the necessary resources. Activate the screen shield dialog when necessary. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:52 +00:00
Georges Basile Stavracas Neto	e42700a308	screenShield: Lift the unlock dialog Instead of scaling it, lift the unlock dialog when unlocking, and vice-versa. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:52 +00:00
Georges Basile Stavracas Neto	febc0690c1	screenShield: Remove scrolling https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:52 +00:00
Georges Basile Stavracas Neto	308b4f81b5	screenShield: Cleanup unused method arguments The 'velocity' argument is not used anymore, since the only caller passing a different value than 0 was the drag motion callback. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:52 +00:00
Georges Basile Stavracas Neto	66a3ad42da	screenShield: Remove the drag action from the shield This is start of the end of the screen shield; start by removing the dragging action from it. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:52 +00:00
Georges Basile Stavracas Neto	1b84a3ecb2	unlockDialog: Don't destroy on cancel Otherwise there will be no way to recover it in the future. Also remove an else condition that assumed the dialog would destroy itself on cancel. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:52 +00:00
Georges Basile Stavracas Neto	78fd9d9e4f	screenShield: Always show session's unlock dialog Instead of destroying the dialog when the screen shield is visible, and creating it when lifting the shield, always show the session's unlock dialog. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:52 +00:00
Georges Basile Stavracas Neto	baa5bfcf49	screenShield: Remove _lockScreenContents and family It is not used anymore, and together with it, we don't need the _ensureLockScreen() / _clearLockScreen() pair anymore too. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:52 +00:00
Georges Basile Stavracas Neto	5d88729fc1	unlockDialog: Blur background Add a 200px blur with a 55% brightness to the unlock dialog background. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:51 +00:00
Georges Basile Stavracas Neto	15b59414d6	screenShield: Move background to Unlock Dialog In addition to that, remove the ClutterBoxLayout that is set as the layout manager of the Unlock Dialog, and apply the primary monitor constraint to the child St.BoxLayout instead. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:51 +00:00
Georges Basile Stavracas Neto	2b39d6e95a	screenShield: Remove unused 'onPrimary' argument The 'onPrimary' argument was being passed to dialog.open(). Turns out, neither UnlockDialog nor LoginDialog use this parameter. Remove the unnecessary 'onPrimary' parameter, and cleanup the related code. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:51 +00:00
Georges Basile Stavracas Neto	73eaf0df9f	screenShield: Move notifications to Unlock Dialog Also adjust the CSS style classes names to match the new owner. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:51 +00:00
Georges Basile Stavracas Neto	54e2d3ceb7	unlockDialog, loginDialog: Add a 'wake-up-screen' signal The signal is currently present in the notifications box, but next commits will move the notifications box to the unlock dialog. Add a 'wake-up-screen' signal to the dialogs. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:51 +00:00
Georges Basile Stavracas Neto	d3cfb5801b	unlockDialog: Adjust date format As per design feedback at FOSDEM, adjust the time format to not have a comma, nor padding. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:51 +00:00
Georges Basile Stavracas Neto	143cda628e	screenShield: Move clock to Unlock Dialog Move the Screen Shield clock to Unlock Dialog. Also adjust the CSS style classes names to match the new owner. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:51 +00:00
Georges Basile Stavracas Neto	e90940ae10	screenShield: Remove arrows They are not present anywhere in the new mockups. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872	2020-02-10 22:30:51 +00:00
Carlos Garnacho	34207cc457	keyboard: Only enable automatically if ClutterSeat::touch-mode is enabled This defers the policy on backends about whether it makes sense to show the OSK. Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/872	2020-02-10 22:07:19 +00:00
Jiri Grönroos	cedcda0ccc	Update Finnish translation	2020-02-10 21:31:42 +00:00
Emin Tufan Çetin	cfcf1d5192	Update Turkish translation	2020-02-10 20:24:58 +00:00
Kukuh Syafaat	8d9bc4bc4c	Update Indonesian translation	2020-02-10 06:52:35 +00:00
Fran Dieguez	d456e938d2	Update Galician translation	2020-02-09 22:26:45 +00:00
sicklylife	f15208e26d	Update Japanese translation	2020-02-08 20:44:46 +00:00
sicklylife	1999a359fa	Update Japanese translation	2020-02-08 20:31:51 +00:00
Bruce Cowan	3c180bc8f7	Update British English translation	2020-02-08 13:03:04 +00:00
Aurimas Černius	8de42d1f63	Updated Lithuanian translation	2020-02-08 14:25:56 +02:00
Asier Sarasua Garmendia	1769a96362	Update Basque translation	2020-02-08 08:10:26 +00:00
Danial Behzadi	37a3d0d09a	Update Persian translation	2020-02-07 22:06:14 +00:00
Carlos Garnacho	e16def0c43	magnifier: Make magnification factor changes animatable So we can seamlessly change between them through eg. keybindings. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/984	2020-02-07 18:18:25 +01:00
Carlos Garnacho	83d083f189	magnifier: Implement pointer motion tracking differently The use of the core idle monitor means that focus change events are also delayed by keyboard interaction. Since the magnifier is already in the business of pointer tracking, it's easy enough to fire the pointer rest timeout from here, so focus changes are accumulated and delayed. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/984	2020-02-07 18:18:25 +01:00
Carlos Garnacho	b1ea4f6c35	magnifier: Animate focus/caret position changes https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/984	2020-02-07 18:18:25 +01:00
Carlos Garnacho	60c540e93a	magnifier: Add support for animating "scroll" on focus changes This is nice in that it provides a hint of the relative position of the new focus area, as opposed to a sudden jump. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/984	2020-02-07 18:18:25 +01:00
Carlos Garnacho	f3b56e0eb1	magnifier: Transform a11y events' coordinates by scale factor We get those events in logical coordinates, which we have to transform into actual pixels. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/984	2020-02-07 18:18:25 +01:00
Carlos Garnacho	c8d02be14a	magnifier: Ignore repeated a11y events We may get several a11y events setting the caret on the same coordinates it previously was. Make focus tracking ignore those, as we're jumping to the same coordinates again during eg. mouse operation. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/984	2020-02-07 18:18:25 +01:00
Carlos Garnacho	42b50051ac	magnifier: Sanity check coordinates in scrollContentsTo We may receive a11y events with bogus coordinates (eg. x/y = minint), so ensure the coordinates are sane before scrolling there. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/984	2020-02-07 18:18:25 +01:00
Carlos Garnacho	bda18888c0	magnifier: Clip all crosshair lines at even distances If the crosshair is clipped so it doesn't cover the pointer cursor, the clip rectangle is skewed towards the bottom/right. This was made so to accomodate the default pointer, but the unevenness stays on other pointer cursors, and it makes the crosshair look odd on short crosshair length. Make all lines clip to an even distance from the center instead. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/984	2020-02-07 18:18:25 +01:00
Carlos Garnacho	c150fe95b9	magnifier: Apply color inversion to crosshairs/pointer It is somewhat unexpected that crosshair color and pointer cursor colors remain the same across changes in color inversion settings, and may lead to contrast issues. Apply the effect on the common container, so it applies to these all. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/984	2020-02-07 18:18:25 +01:00
Carlos Garnacho	8b4b9d396b	magnifier: Apply scale factor to crosshair length On hidpi displays the length is double as advertised, make it match the advertised length. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/984	2020-02-07 18:18:25 +01:00
Anders Jonsson	9c0f069f86	Update Swedish translation	2020-02-07 15:02:26 +00:00
Daniel van Vugt	8929c89d1f	workspace: Animate window clones using translation properties Instead of position x/y properties. This reduces CPU-intensive relayouts in JavaScript (`vfunc_allocate` etc). Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/1271 since the other fix required already landed in `4c4846e9`. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/936	2020-02-07 14:43:56 +00:00
Daniel van Vugt	881eab7669	dnd: Make DND translation-property-aware Previously DND only worked properly for actors with zero translation. But it only requires a small tweak to `this._dragOffsetX/Y` to support non-zero translation values. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/936	2020-02-07 14:43:56 +00:00
Danial Behzadi	141652b7ec	Update Persian translation	2020-02-07 13:04:10 +00:00
Daniel van Vugt	b5651e38c7	iconGrid: Avoid animating the same icon twice If the icon proper has opacity of zero then that's probably because a clone of it is animating. So avoid animating the source actor too. And if there's any other reason for the opacity being zero, still don't animate it because we can't see it :) Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/2167	2020-02-07 11:31:20 +00:00
Daniel van Vugt	33ae220ad2	appDisplay: Call super.vfunc_unmap last So as to guarantee the unmapped state sticks and doesn't get toggled back to mapped before we return. Being in a mapped state when `FolderIcon.vfunc_unmap()` returned was causing an assertion failure in `clutter_actor_set_mapped` and crashed the shell. Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/2170	2020-02-07 11:23:25 +00:00
Daniel Mustieles	6ec996e45b	Updated Spanish translation	2020-02-07 11:54:07 +01:00
Daniel Mustieles	4f3e847897	Merge branch 'master' of gitlab.gnome.org:GNOME/gnome-shell	2020-02-07 11:54:07 +01:00
Rafael Fontenelle	07a1f107cc	Update Brazilian Portuguese translation	2020-02-06 23:47:17 +00:00
Daniel Mustieles	89790ac723	Updated Spanish translation	2020-02-06 11:40:07 +01:00