| commit | 25829c3e1ba5a778c0db196260e94bebdda023bb | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Nov 22 01:21:10 2022 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Nov 22 01:21:10 2022 +0000 |
| tree | eaee547109a8dbd775d77ff17e6c46404e02bbfa | |
| parent | c502685f7a016c2978ff5d0062db1451f176c60c [diff] | |
| parent | a62929a63b339e4b6e8ccc983347611122e6d73c [diff] |
Merge changes I4dff7875,If2dbfc35 into tm-qpr-dev * changes: Remove smartspace offset Bouncer - Fix activity launch
diff --git a/packages/SystemUI/res/values-sw600dp-land/dimens.xml b/packages/SystemUI/res/values-sw600dp-land/dimens.xml index b24ce12..6c7cab5 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>
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 59b4adc..f772b17 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 @@ } } view.repeatWhenAttached { - repeatOnLifecycle(Lifecycle.State.STARTED) { + repeatOnLifecycle(Lifecycle.State.CREATED) { try { viewModel.setBouncerViewDelegate(delegate) launch {