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

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

Merge "Reset bouncer instead of just hiding it"

parents 58b0948b 3c9df5a0

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

+1 −1
Original line number Diff line number Diff line
@@ -4519,7 +4519,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
            if (isScreenTurningOnOrOn()) {

                if (DEBUG_CAMERA_LIFT) Slog.d(TAG, "Launching camera");

                if (mStatusBarKeyguardViewManager.isBouncerShowing()) {

                    mStatusBarKeyguardViewManager.hideBouncer(false /* destroyView */);

                    mStatusBarKeyguardViewManager.reset(true /* hide */);

                }

                mNotificationPanel.launchCamera(mDeviceInteractive /* animate */, source);

                updateScrimController();

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

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        updateStates();

    }



    public void hideBouncer(boolean destroyView) {

    private void hideBouncer(boolean destroyView) {

        mBouncer.hide(destroyView);

        cancelPendingWakeupAction();

    }