Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25829c3e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I4dff7875,If2dbfc35 into tm-qpr-dev

* changes:
  Remove smartspace offset
  Bouncer - Fix activity launch
parents c502685f a62929a6
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -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>
+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ object KeyguardBouncerViewBinder {
                }
            }
        view.repeatWhenAttached {
            repeatOnLifecycle(Lifecycle.State.STARTED) {
            repeatOnLifecycle(Lifecycle.State.CREATED) {
                try {
                    viewModel.setBouncerViewDelegate(delegate)
                    launch {