Merge ~vanvugt/ubuntu/+source/gnome-shell:fix-lp1813119-disco into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master

[Daniel van Vugt]

Update ubuntu/background_login.patch to match disco theme

Fixes LP: #1813119

[Didier Roche-Tolomelli (didrocks)]

LGTM and color matches new Yaru theme in GDM.
+1

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 0934982..c208428 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gnome-shell (3.31.90-1ubuntu2) UNRELEASED; urgency=medium
+
+  * Update ubuntu/background_login.patch to match the new login screen
+    (system background) design from Yaru for a smooth login animation
+    (LP: #1813119).
+
+ -- Daniel van Vugt <[e-mail]>  Fri, 01 Mar 2019 16:09:30 +0800
+
 gnome-shell (3.31.90-1ubuntu1) disco; urgency=medium
 
   [ Marco Trevisan (Treviño) ]
diff --git a/debian/patches/ubuntu/background_login.patch b/debian/patches/ubuntu/background_login.patch
index 6f85511..4f509b8 100644
--- a/debian/patches/ubuntu/background_login.patch
+++ b/debian/patches/ubuntu/background_login.patch
@@ -1,21 +1,17 @@
-From: Didier Roche <[e-mail]>
-Date: Wed, 20 Jun 2018 19:22:06 +0200
-Subject: Change default background color based on session.
-
-We changed default GDM color for our ubuntu session. Change it as well here
-to match Yaru GDM background.
-This screen is appearing for a slip second when the Shell is loading.
+Description: js/ui/background.js: Use Ubuntu purple to match login screen
+ 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
 Forwarded: not-needed
-===================================================================
----
- js/ui/background.js | 21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
 
-diff --git a/js/ui/background.js b/js/ui/background.js
-index 874bda3..0a4e9ad 100644
---- a/js/ui/background.js
-+++ b/js/ui/background.js
-@@ -101,6 +101,7 @@ const GnomeDesktop = imports.gi.GnomeDesktop;
+Index: gnome-shell/js/ui/background.js
+===================================================================
+--- gnome-shell.orig/js/ui/background.js
++++ gnome-shell/js/ui/background.js
+@@ -101,6 +101,7 @@ const GnomeDesktop = imports.gi.GnomeDes
  const Meta = imports.gi.Meta;
  const Signals = imports.signals;
  
@@ -23,7 +19,7 @@ index 874bda3..0a4e9ad 100644
  const LoginManager = imports.misc.loginManager;
  const Main = imports.ui.main;
  const Params = imports.misc.params;
-@@ -489,6 +490,26 @@ let _systemBackground;
+@@ -489,6 +490,25 @@ let _systemBackground;
  
  var SystemBackground = class SystemBackground {
      constructor() {
@@ -31,9 +27,8 @@ index 874bda3..0a4e9ad 100644
 +        if (Desktop.is("ubuntu")) {
 +            if (_systemBackground == null) {
 +                _systemBackground = new Meta.Background({ meta_display: global.display });
-+                let [, topColor] = Clutter.Color.from_string('#6D2169');
-+                let [, bottomColor] = Clutter.Color.from_string('#370026');
-+                _systemBackground.set_gradient(GDesktopEnums.BackgroundShading.VERTICAL, topColor, bottomColor);
++                let [, ubuntuColor] = Clutter.Color.from_string('#2C001E');
++                _systemBackground.set_color(ubuntuColor);
 +            }
 +            this.actor = new Meta.BackgroundActor({ meta_display: global.display,
 +                                                    monitor: 0,