Merge ~vanvugt/ubuntu/+source/gnome-shell:fix-eoan-purple-system-background into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master

[Daniel van Vugt]

background_login.patch: Match 19.10 Yaru purple login screen with noise.

This way the login animation will appear to expand over the login screen
(system background) instead of suddenly replacing it.

It would be so nice to automate matching of these two styles, but nobody has made the time yet.

P.S. The diff of the diff looks wrong but it's not. Try just reviewing the whole file:
https://git.launchpad.net/~vanvugt/ubuntu/+source/gnome-shell/tree/debian/patches/ubuntu/background_login.patch?h=fix-eoan-purple-system-background

[Iain Lane (laney)]

thanks!

review: Approve

diff --git a/debian/patches/ubuntu/background_login.patch b/debian/patches/ubuntu/background_login.patch
index 98334d7..29bbceb 100644
--- a/debian/patches/ubuntu/background_login.patch
+++ b/debian/patches/ubuntu/background_login.patch
@@ -1,27 +1,15 @@
-From: Daniel van Vugt <[e-mail]>
-Date: Wed, 6 Mar 2019 14:48:10 +0000
-Subject: js/ui/background.js: Use Ubuntu purple to match login screen
-
-Original author: Didier Roche <[e-mail]>
-Bug-Ubuntu: https://launchpad.net/bugs/1813119
-Last-Update: 2019-03-01
-Forwarded: not-needed
-
-This way the login animation will appear to expand over the login
-screen (system background) instead of suddenly replacing it.
+Description: js/ui/background.js: Match 19.10 Yaru purple login screen with noise.
+ This way the login animation will appear to expand over the login
+ screen (system background) instead of suddenly replacing it.
 Original author: Didier Roche <[e-mail]>
 Author: Daniel van Vugt <[e-mail]>
-Bug-Ubuntu: https://launchpad.net/bugs/1813119
-Last-Update: 2019-03-01
+Last-Update: 2019-08-30
 Forwarded: not-needed
----
- js/ui/background.js | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
 
-diff --git a/js/ui/background.js b/js/ui/background.js
-index babc1e4..ab1dba0 100644
---- a/js/ui/background.js
-+++ b/js/ui/background.js
+Index: gnome-shell/js/ui/background.js
+===================================================================
+--- gnome-shell.orig/js/ui/background.js
++++ gnome-shell/js/ui/background.js
 @@ -96,6 +96,7 @@
  const { Clutter, GDesktopEnums, Gio, GLib, GnomeDesktop, Meta } = imports.gi;
  const Signals = imports.signals;
@@ -30,16 +18,18 @@ index babc1e4..ab1dba0 100644
  const LoginManager = imports.misc.loginManager;
  const Main = imports.ui.main;
  const Params = imports.misc.params;
-@@ -499,6 +500,25 @@ let _systemBackground;
- 
- var SystemBackground = class SystemBackground {
+@@ -501,6 +502,27 @@ var SystemBackground = class SystemBackg
      constructor() {
+         let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/noise-texture.png');
+ 
 +        // Yaru is default ubuntu theme, match GDM look
 +        if (Desktop.is("ubuntu")) {
 +            if (_systemBackground == null) {
-+                _systemBackground = new Meta.Background({ meta_display: global.display });
-+                let [, ubuntuColor] = Clutter.Color.from_string('#2C001E');
++                _systemBackground = new Meta.Background({ meta_display: global.display })
++                // Yaru uses darken(#762572, 10%) + noise for #lockDialogGroup
++                let [, ubuntuColor] = Clutter.Color.from_string('#4f194c');
 +                _systemBackground.set_color(ubuntuColor);
++                _systemBackground.set_file(file, GDesktopEnums.BackgroundStyle.WALLPAPER);
 +            }
 +            this.actor = new Meta.BackgroundActor({ meta_display: global.display,
 +                                                    monitor: 0,
@@ -53,6 +43,6 @@ index babc1e4..ab1dba0 100644
 +            return;
 +        }
 +
-         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);