Merge changes I4dff7875,If2dbfc35 into tm-qpr-dev am: 25829c3e1b am: 7bd2e234b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20532976 Change-Id: If05ac194888f78067175553ce9493e8afcc8f979 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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>
|
||||
|
||||
@@ -88,7 +88,7 @@ object KeyguardBouncerViewBinder {
|
||||
}
|
||||
}
|
||||
view.repeatWhenAttached {
|
||||
repeatOnLifecycle(Lifecycle.State.STARTED) {
|
||||
repeatOnLifecycle(Lifecycle.State.CREATED) {
|
||||
try {
|
||||
viewModel.setBouncerViewDelegate(delegate)
|
||||
launch {
|
||||
|
||||
Reference in New Issue
Block a user