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

Commit 879b9a18 authored by Aaron Liu's avatar Aaron Liu Committed by Android (Google) Code Review
Browse files

Merge "[Bouncer] Remove KeyguardBouncer.java"

parents ca0e3a07 ad563390

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -279,7 +279,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
    private boolean mLastScreenOffAnimationPlaying;

    private boolean mLastScreenOffAnimationPlaying;

    private float mQsExpansion;

    private float mQsExpansion;

    final Set<KeyguardViewManagerCallback> mCallbacks = new HashSet<>();

    final Set<KeyguardViewManagerCallback> mCallbacks = new HashSet<>();

    private boolean mIsModernBouncerEnabled;

    private boolean mIsModernAlternateBouncerEnabled;

    private boolean mIsModernAlternateBouncerEnabled;

    private boolean mIsUnoccludeTransitionFlagEnabled;

    private boolean mIsUnoccludeTransitionFlagEnabled;

    private boolean mIsBackAnimationEnabled;

    private boolean mIsBackAnimationEnabled;
@@ -358,7 +357,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        mPrimaryBouncerView = primaryBouncerView;

        mPrimaryBouncerView = primaryBouncerView;

        mFoldAodAnimationController = sysUIUnfoldComponent

        mFoldAodAnimationController = sysUIUnfoldComponent

                .map(SysUIUnfoldComponent::getFoldAodAnimationController).orElse(null);

                .map(SysUIUnfoldComponent::getFoldAodAnimationController).orElse(null);

        mIsModernBouncerEnabled = featureFlags.isEnabled(Flags.MODERN_BOUNCER);

        mIsModernAlternateBouncerEnabled = featureFlags.isEnabled(Flags.MODERN_ALTERNATE_BOUNCER);

        mIsModernAlternateBouncerEnabled = featureFlags.isEnabled(Flags.MODERN_ALTERNATE_BOUNCER);

        mAlternateBouncerInteractor = alternateBouncerInteractor;

        mAlternateBouncerInteractor = alternateBouncerInteractor;

        mIsUnoccludeTransitionFlagEnabled = featureFlags.isEnabled(Flags.UNOCCLUSION_TRANSITION);

        mIsUnoccludeTransitionFlagEnabled = featureFlags.isEnabled(Flags.UNOCCLUSION_TRANSITION);