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

Commit 662ed801 authored by Bryce Lee's avatar Bryce Lee Committed by Android Git Automerger
Browse files

am e0233e7e: am 73b56873: am eccaf729: Allow going to home action to work for... 

am e0233e7e: am 73b56873: am eccaf729: Allow going to home action to work for SHORT_PRESS_POWER_GO_HOME with keyguard enabled.

* commit 'e0233e7e':
  Allow going to home action to work for SHORT_PRESS_POWER_GO_HOME with keyguard enabled.
parents 76ef9b07 e0233e7e

services/core/java/com/android/server/policy/PhoneWindowManager.java

+42 −36
Original line number Diff line number Diff line
@@ -990,7 +990,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    launchHomeFromHotKey();

                    break;

                case SHORT_PRESS_POWER_GO_HOME:

                    launchHomeFromHotKey();

                    launchHomeFromHotKey(true /* awakenFromDreams */, false /*respectKeyguard*/);

                    break;

            }

        }
@@ -1068,7 +1068,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                        PowerManager.GO_TO_SLEEP_REASON_SLEEP_BUTTON, 0);

                break;

            case SHORT_PRESS_SLEEP_GO_TO_SLEEP_AND_GO_HOME:

                launchHomeFromHotKey(false /* awakenDreams */);

                launchHomeFromHotKey(false /* awakenDreams */, true /*respectKeyguard*/);

                mPowerManager.goToSleep(event.getEventTime(),

                        PowerManager.GO_TO_SLEEP_REASON_SLEEP_BUTTON, 0);

                break;
@@ -3059,17 +3059,21 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    }



    void launchHomeFromHotKey() {

        launchHomeFromHotKey(true /* awakenFromDreams */);

        launchHomeFromHotKey(true /* awakenFromDreams */, true /*respectKeyguard*/);

    }



    /**

     * A home key -> launch home action was detected.  Take the appropriate action

     * given the situation with the keyguard.

     */

    void launchHomeFromHotKey(final boolean awakenFromDreams) {

    void launchHomeFromHotKey(final boolean awakenFromDreams, final boolean respectKeyguard) {

        if (respectKeyguard) {

            if (isKeyguardShowingAndNotOccluded()) {

                // don't launch home if keyguard showing

        } else if (!mHideLockScreen && mKeyguardDelegate.isInputRestricted()) {

                return;

            }



            if (!mHideLockScreen && mKeyguardDelegate.isInputRestricted()) {

                // when in keyguard restricted mode, must first verify unlock

                // before launching home

                mKeyguardDelegate.verifyUnlock(new OnKeyguardExitResult() {
@@ -3085,7 +3089,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                        }

                    }

                });

        } else {

                return;

            }

        }



        // no keyguard stuff to worry about, just launch home!

        try {

            ActivityManagerNative.getDefault().stopAppSwitches();
@@ -3104,7 +3111,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            startDockOrHome(true /*fromHomeKey*/, awakenFromDreams);

        }

    }

    }



    private final Runnable mClearHideNavigationFlag = new Runnable() {

        @Override