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

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

am 1e2a01a6: am 68993a41: am 99a6c1cb: Merge "[Theater Mode] Add framework... 

am 1e2a01a6: am 68993a41: am 99a6c1cb: Merge "[Theater Mode] Add framework support for screen double tapping out of theater mode." into lmp-sprout-dev automerge: abf33e48

* commit '1e2a01a6':
  [Theater Mode] Add framework support for screen double tapping out of theater mode.
parents 4c148e91 1e2a01a6

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+28 −6
Original line number Diff line number Diff line
@@ -4767,18 +4767,39 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    @Override

    public int interceptMotionBeforeQueueingNonInteractive(long whenNanos, int policyFlags) {

        if ((policyFlags & FLAG_WAKE) != 0) {

            wakeUp(whenNanos / 1000000, mAllowTheaterModeWakeFromMotion);

            if (wakeUp(whenNanos / 1000000, mAllowTheaterModeWakeFromMotion)) {

                return 0;

            }

        }



        if (shouldDispatchInputWhenNonInteractive()) {

            return ACTION_PASS_TO_USER;

        }



        return 0;

    }



    private boolean shouldDispatchInputWhenNonInteractive() {

        return keyguardIsShowingTq() && mDisplay != null &&

                mDisplay.getState() != Display.STATE_OFF;

        // Send events to keyguard while the screen is on.

        if (keyguardIsShowingTq() && mDisplay != null && mDisplay.getState() != Display.STATE_OFF) {

            return true;

        }



        // Send events to a dozing dream even if the screen is off since the dream

        // is in control of the state of the screen.

        IDreamManager dreamManager = getDreamManager();



        try {

            if (dreamManager != null && dreamManager.isDreaming()) {

                return true;

            }

        } catch (RemoteException e) {

            Slog.e(TAG, "RemoteException when checking if dreaming", e);

        }



        // Otherwise, consume events since the user can't see what is being

        // interacted with.

        return false;

    }



    void dispatchMediaKeyWithWakeLock(KeyEvent event) {
@@ -4949,12 +4970,13 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        wakeUp(eventTime, mAllowTheaterModeWakeFromPowerKey);

    }



    private void wakeUp(long wakeTime, boolean wakeInTheaterMode) {

    private boolean wakeUp(long wakeTime, boolean wakeInTheaterMode) {

        if (!wakeInTheaterMode && isTheaterModeEnabled()) {

            return;

            return false;

        }



        mPowerManager.wakeUp(wakeTime);

        return true;

    }



    // Called on the PowerManager's Notifier thread.