Merge branch 'main' into themes

lua/main.lua

@@ -33,6 +33,18 @@ GLOBAL_BINDINGS = {
       container:center()
     end)
   end),
+  -- When the device has been locked for a while, default to showing the now
+  -- playing screen after unlocking.
+  controls.lock_switch:bind(function(locked)
+    if locked then
+      lock_time = time.ticks()
+    elseif time.ticks() - lock_time > 8000 then
+      local queue = require("queue")
+      if queue.size:get() > 0 then
+        require("playing"):pushIfNotShown()
+      end
+    end
+  end),
 }
 
 local theme_dark = require("theme_dark")