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

Commit f2c9f776 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't update the alternate bouncer on unlocked change" into udc-qpr-dev... 

Merge "Don't update the alternate bouncer on unlocked change" into udc-qpr-dev am: 9c9e0b77 am: 81100543

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24465928



Change-Id: I13a91199c2e4bb620dd442b511211abe279bf52a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a4bcc9e3 81100543

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

+2 −10
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@ import com.android.systemui.statusbar.policy.KeyguardStateController; 
import com.android.systemui.unfold.FoldAodAnimationController;

import com.android.systemui.unfold.SysUIUnfoldComponent;



import dagger.Lazy;



import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.HashSet;
@@ -101,7 +103,6 @@ import java.util.Set; 


import javax.inject.Inject;



import dagger.Lazy;

import kotlinx.coroutines.CoroutineDispatcher;



/**
@@ -450,14 +451,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        }

    }



    private KeyguardStateController.Callback mKeyguardStateControllerCallback =

            new KeyguardStateController.Callback() {

                @Override

                public void onUnlockedChanged() {

                    updateAlternateBouncerShowing(mAlternateBouncerInteractor.maybeHide());

                }

            };



    private void registerListeners() {

        mKeyguardUpdateManager.registerCallback(mUpdateMonitorCallback);

        mStatusBarStateController.addCallback(this);
@@ -471,7 +464,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
            mDockManager.addListener(mDockEventListener);

            mIsDocked = mDockManager.isDocked();

        }

        mKeyguardStateController.addCallback(mKeyguardStateControllerCallback);



        if (mFlags.isEnabled(Flags.KEYGUARD_WM_STATE_REFACTOR)) {

            mShadeViewController.postToView(() ->