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

Commit 2fff119b authored by Sam Mortimer's avatar Sam Mortimer Committed by Bruno Martins
Browse files

fw/b torch: Let long press power turn torch off when screen is on. 

* When the torch is on, any subsequent long press power is almost certainly
  intended to turn the torch off (regardless of screen state).  Therefore,
  always allow long press power to toggle torch if the torch is on.

* Tested: long press power toggles torch on/off with screen off.
          long press power toggles torch off with screen on and torch on.
          long press power brings up global actions menu with screen on and torch off.

Change-Id: I932caa9f3be06d14408aea2ecb3a6eca73e052e0
parent dc940b46

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

+1 −1
Original line number Diff line number Diff line
@@ -1346,7 +1346,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        if (FactoryTest.isLongPressOnPowerOffEnabled()) {

            return LONG_PRESS_POWER_SHUT_OFF_NO_CONFIRM;

        }

        if (mTorchLongPressPowerEnabled && (!isScreenOn() || isDozeMode())) {

        if (mTorchLongPressPowerEnabled && (!isScreenOn() || isDozeMode() || mTorchEnabled)) {

            return LONG_PRESS_POWER_TORCH;

        }