Merge lp:~elementary-os/elementaryos/default-settings-maximize into lp:~elementary-os/elementaryos/default-settings-loki

[Cassidy James Blaede]

Cleans up maximize and unmaximize defaults to fix bug 1566546.

Cleans up maximize and unmaximize defaults to fix bug 1566546.

[lp:~elementary-os/elementaryos/default-settings-maximize]

216. By Cassidy James Blaede on 2017-03-10

Revert the deprecation of unmaximize because small diff best diff

217. By Cassidy James Blaede on 2017-03-10

Remove periods I accidentally added

=== modified file 'debian/elementary-default-settings.gsettings-override'
--- debian/elementary-default-settings.gsettings-override	2017-01-25 10:26:24 +0000
+++ debian/elementary-default-settings.gsettings-override	2017-03-10 19:27:53 +0000
@@ -36,6 +36,8 @@
 lock-enabled=false
 
 [org.gnome.desktop.wm.keybindings]
+# defaults to <Super>Up, replaced by toggle below, so we need to clear it here
+maximize=[]
 move-to-workspace-1=['<Super><Shift>1','<Super><Alt>1']
 move-to-workspace-2=['<Super><Shift>2','<Super><Alt>2']
 move-to-workspace-3=['<Super><Shift>3','<Super><Alt>3']
@@ -71,6 +73,7 @@
 switch-to-workspace-9=['<Super>9']
 switch-windows=['<Alt>Tab']
 switch-windows-backward=['<Alt><Shift>Tab']
+toggle-maximized=['<Super>Up']
 # defaults to <Super>Down used above, so we need to override it
 unmaximize=['<Alt>F5']