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

Commit 8fec01a1 authored by Winson Chung's avatar Winson Chung
Browse files

Revert to O home button behaviour for over lockscreen activities

- Reverting specific changes from ag/3458963

Bug: 111789245
Test: Launch camera, hit home
Change-Id: Ib0fe79dbe125e418193f991f22d09777e2bbc3bb
parent b0e3c678
Loading
Loading
Loading
Loading
+3 −11
Original line number Original line Diff line number Diff line
@@ -4397,17 +4397,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
            if (isKeyguardShowingAndNotOccluded()) {
            if (isKeyguardShowingAndNotOccluded()) {
                // don't launch home if keyguard showing
                // don't launch home if keyguard showing
                return;
                return;
            } else if (mKeyguardOccluded && mKeyguardDelegate.isShowing()) {
                mKeyguardDelegate.dismiss(new KeyguardDismissCallback() {
                    @Override
                    public void onDismissSucceeded() throws RemoteException {
                        mHandler.post(() -> {
                            startDockOrHome(true /*fromHomeKey*/, awakenFromDreams);
                        });
            }
            }
                }, null /* message */);

                return;
            if (!mKeyguardOccluded && mKeyguardDelegate.isInputRestricted()) {
            } else if (!mKeyguardOccluded && mKeyguardDelegate.isInputRestricted()) {
                // when in keyguard restricted mode, must first verify unlock
                // when in keyguard restricted mode, must first verify unlock
                // before launching home
                // before launching home
                mKeyguardDelegate.verifyUnlock(new OnKeyguardExitResult() {
                mKeyguardDelegate.verifyUnlock(new OnKeyguardExitResult() {