From 9efdc707f3846a9946edab93440ee9313e11dcf7 Mon Sep 17 00:00:00 2001
From: Matt Pietal <mpietal@google.com>
Date: Fri, 18 Nov 2022 15:01:55 +0000
Subject: Bouncer - Fix activity launch

The bouncer view delegate was not being created soon enough, resulting
in the dismiss action being dropped and not run after a succesful
auth.

Fixes: 259666226
Test: manual, follow steps in bug
Change-Id: If2dbfc35379d6c1b0f46575ab9e4e4bb0769ce6f
---
 .../android/systemui/keyguard/ui/binder/KeyguardBouncerViewBinder.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBouncerViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBouncerViewBinder.kt
index 3c927ee08494..5a742b5356be 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBouncerViewBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBouncerViewBinder.kt
@@ -88,7 +88,7 @@ object KeyguardBouncerViewBinder {
                 }
             }
         view.repeatWhenAttached {
-            repeatOnLifecycle(Lifecycle.State.STARTED) {
+            repeatOnLifecycle(Lifecycle.State.CREATED) {
                 try {
                     viewModel.setBouncerViewDelegate(delegate)
                     launch {
-- 
cgit v1.2.3-59-g8ed1b


From a62929a63b339e4b6e8ccc983347611122e6d73c Mon Sep 17 00:00:00 2001
From: Matt Pietal <mpietal@google.com>
Date: Mon, 21 Nov 2022 14:55:00 +0000
Subject: Remove smartspace offset

For foldables, the smartspace content is too low when the large clock
is showing. Move up to provide a bit more space.

Fixes: 245614151
Test: manual - review layout for wide devices
Change-Id: I4dff7875a7872db979e1cca3fcb1e9d5ed2fd056
---
 packages/SystemUI/res/values-sw600dp-land/dimens.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/SystemUI/res/values-sw600dp-land/dimens.xml b/packages/SystemUI/res/values-sw600dp-land/dimens.xml
index b24ce122208f..6c7cab51f440 100644
--- a/packages/SystemUI/res/values-sw600dp-land/dimens.xml
+++ b/packages/SystemUI/res/values-sw600dp-land/dimens.xml
@@ -24,6 +24,7 @@
     <!-- margin from keyguard status bar to clock. For split shade it should be
          keyguard_split_shade_top_margin - status_bar_header_height_keyguard = 8dp -->
     <dimen name="keyguard_clock_top_margin">8dp</dimen>
+    <dimen name="keyguard_smartspace_top_offset">0dp</dimen>
 
     <!-- QS-->
     <dimen name="qs_panel_padding_top">16dp</dimen>
-- 
cgit v1.2.3-59-g8ed1b