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

Commit 1d2db397 authored by Heemin Seog's avatar Heemin Seog Committed by Automerger Merge Worker
Browse files

Merge "Remove phone specific shade controller from KeyguardViewMediator" into... 

Merge "Remove phone specific shade controller from KeyguardViewMediator" into rvc-dev am: 14a64250

Change-Id: I7e23b87e756eadc85024752b1123f7dbad951830
parents 0a84c85c 14a64250

packages/CarSystemUI/src/com/android/systemui/car/keyguard/CarKeyguardViewController.java

+5 −0
Original line number Diff line number Diff line
@@ -263,6 +263,11 @@ public class CarKeyguardViewController extends OverlayViewController implements 
        // no-op

    }



    @Override

    public void setKeyguardGoingAwayState(boolean isKeyguardGoingAway) {

        // no-op

    }



    @Override

    public void onStartedGoingToSleep() {

        // no-op

packages/SystemUI/src/com/android/keyguard/KeyguardViewController.java

+5 −0
Original line number Diff line number Diff line
@@ -113,6 +113,11 @@ public interface KeyguardViewController { 
     */

    void keyguardGoingAway();



    /**

     * Sets the system state depending on whether the keyguard is going away or not.

     */

    void setKeyguardGoingAwayState(boolean isKeyguardGoingAway);



    /**

     * @return Whether window animation for unlock should be disabled.

     */

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+5 −8
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ import com.android.systemui.statusbar.phone.BiometricUnlockController; 
import com.android.systemui.statusbar.phone.KeyguardBypassController;

import com.android.systemui.statusbar.phone.NavigationModeController;

import com.android.systemui.statusbar.phone.NotificationPanelViewController;

import com.android.systemui.statusbar.phone.NotificationShadeWindowController;

import com.android.systemui.statusbar.phone.StatusBar;

import com.android.systemui.util.DeviceConfigProxy;

import com.android.systemui.util.InjectionInflationController;
@@ -216,7 +215,6 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable { 
    private AlarmManager mAlarmManager;

    private AudioManager mAudioManager;

    private StatusBarManager mStatusBarManager;

    private final NotificationShadeWindowController mNotificationShadeWindowController;

    private final Executor mUiBgExecutor;



    private boolean mSystemReady;
@@ -628,7 +626,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable { 
        @Override

        public void keyguardGone() {

            Trace.beginSection("KeyguardViewMediator.mViewMediatorCallback#keyguardGone");

            mNotificationShadeWindowController.setKeyguardGoingAway(false);

            mKeyguardViewControllerLazy.get().setKeyguardGoingAwayState(false);

            mKeyguardDisplayManager.hide();

            Trace.endSection();

        }
@@ -717,7 +715,6 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable { 
            FalsingManager falsingManager,

            LockPatternUtils lockPatternUtils,

            BroadcastDispatcher broadcastDispatcher,

            NotificationShadeWindowController notificationShadeWindowController,

            Lazy<KeyguardViewController> statusBarKeyguardViewManagerLazy,

            DismissCallbackRegistry dismissCallbackRegistry,

            KeyguardUpdateMonitor keyguardUpdateMonitor, DumpManager dumpManager,
@@ -729,7 +726,6 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable { 
        mFalsingManager = falsingManager;

        mLockPatternUtils = lockPatternUtils;

        mBroadcastDispatcher = broadcastDispatcher;

        mNotificationShadeWindowController = notificationShadeWindowController;

        mKeyguardViewControllerLazy = statusBarKeyguardViewManagerLazy;

        mDismissCallbackRegistry = dismissCallbackRegistry;

        mUiBgExecutor = uiBgExecutor;
@@ -877,7 +873,8 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable { 
            mGoingToSleep = true;



            // Reset keyguard going away state so we can start listening for fingerprint. We

            // explicitly DO NOT want to call mStatusBarWindowController.setKeyguardGoingAway(false)

            // explicitly DO NOT want to call

            // mKeyguardViewControllerLazy.get().setKeyguardGoingAwayState(false)

            // here, since that will mess with the device lock state.

            mUpdateMonitor.setKeyguardGoingAway(false);
@@ -1861,7 +1858,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable { 
            adjustStatusBarLocked();

            userActivity();

            mUpdateMonitor.setKeyguardGoingAway(false);

            mNotificationShadeWindowController.setKeyguardGoingAway(false);

            mKeyguardViewControllerLazy.get().setKeyguardGoingAwayState(false);

            mShowKeyguardWakeLock.release();

        }

        mKeyguardDisplayManager.show();
@@ -1901,7 +1898,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable { 
            }



            mUpdateMonitor.setKeyguardGoingAway(true);

            mNotificationShadeWindowController.setKeyguardGoingAway(true);

            mKeyguardViewControllerLazy.get().setKeyguardGoingAwayState(true);



            // Don't actually hide the Keyguard at the moment, wait for window

            // manager until it tells us it's safe to do so with

packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java

+0 −3
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import com.android.systemui.keyguard.DismissCallbackRegistry; 
import com.android.systemui.keyguard.KeyguardViewMediator;

import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.statusbar.phone.NavigationModeController;

import com.android.systemui.statusbar.phone.NotificationShadeWindowController;

import com.android.systemui.statusbar.phone.StatusBar;

import com.android.systemui.util.DeviceConfigProxy;
@@ -57,7 +56,6 @@ public class KeyguardModule { 
            FalsingManager falsingManager,

            LockPatternUtils lockPatternUtils,

            BroadcastDispatcher broadcastDispatcher,

            NotificationShadeWindowController notificationShadeWindowController,

            Lazy<KeyguardViewController> statusBarKeyguardViewManagerLazy,

            DismissCallbackRegistry dismissCallbackRegistry,

            KeyguardUpdateMonitor updateMonitor,
@@ -72,7 +70,6 @@ public class KeyguardModule { 
                falsingManager,

                lockPatternUtils,

                broadcastDispatcher,

                notificationShadeWindowController,

                statusBarKeyguardViewManagerLazy,

                dismissCallbackRegistry,

                updateMonitor,

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

+5 −0
Original line number Diff line number Diff line
@@ -915,6 +915,11 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        mStatusBar.keyguardGoingAway();

    }



    @Override

    public void setKeyguardGoingAwayState(boolean isKeyguardGoingAway) {

        mNotificationShadeWindowController.setKeyguardGoingAway(isKeyguardGoingAway);

    }



    @Override

    public void onCancelClicked() {

        // No-op