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

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

Merge "Hide bouncer before launching camera"

parents 7b8905c4 657ef95a

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

+3 −0
Original line number Diff line number Diff line
@@ -4519,6 +4519,9 @@ 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 */);

                }

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

                updateScrimController();

            } else {

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

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

    }



    private void hideBouncer(boolean destroyView) {

    public void hideBouncer(boolean destroyView) {

        mBouncer.hide(destroyView);

        cancelPendingWakeupAction();

    }