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

Commit 6d8fd27e authored by Jeff Brown's avatar Jeff Brown
Browse files

Make power button behavior configurable. 

Allow power button to be used to either go to sleep as usual,
which may doze, or skip that completely and really go to sleep.
May also really go to sleep and go home all at once.

Bug: 14406056
Change-Id: Ia19e2551b9c2a72271bb2eddd5c0d1749761e019
parent 969579bb

core/java/android/os/IPowerManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ interface IPowerManager 


    void userActivity(long time, int event, int flags);

    void wakeUp(long time);

    void goToSleep(long time, int reason);

    void goToSleep(long time, int reason, int flags);

    void nap(long time);

    boolean isInteractive();

core/java/android/os/PowerManager.java

+14 −1
Original line number Diff line number Diff line
@@ -302,6 +302,12 @@ public final class PowerManager { 
     */

    public static final int GO_TO_SLEEP_REASON_TIMEOUT = 2;



    /**

     * Go to sleep flag: Skip dozing state and directly go to full sleep.

     * @hide

     */

    public static final int GO_TO_SLEEP_FLAG_NO_DOZE = 1 << 0;



    final Context mContext;

    final IPowerManager mService;

    final Handler mHandler;
@@ -490,8 +496,15 @@ public final class PowerManager { 
     * @see #wakeUp

     */

    public void goToSleep(long time) {

        goToSleep(time, GO_TO_SLEEP_REASON_USER, 0);

    }



    /**

     * @hide

     */

    public void goToSleep(long time, int reason, int flags) {

        try {

            mService.goToSleep(time, GO_TO_SLEEP_REASON_USER);

            mService.goToSleep(time, reason, flags);

        } catch (RemoteException e) {

        }

    }

core/res/res/values/config.xml

+8 −0
Original line number Diff line number Diff line
@@ -485,6 +485,14 @@ 
    -->

    <integer name="config_longPressOnPowerBehavior">1</integer>



    <!-- Control the behavior when the user short presses the power button.

            0 - Nothing

            1 - Go to sleep (doze)

            2 - Really go to sleep (don't doze)

            3 - Really go to sleep and go home (don't doze)

    -->

    <integer name="config_shortPressOnPowerBehavior">1</integer>



    <!-- Package name for default keyguard appwidget [DO NOT TRANSLATE] -->

    <string name="widget_default_package_name"></string>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -304,6 +304,7 @@ 
  <java-symbol type="integer" name="config_ntpRetry" />

  <java-symbol type="integer" name="config_ntpThreshold" />

  <java-symbol type="integer" name="config_ntpTimeout" />

  <java-symbol type="integer" name="config_shortPressOnPowerBehavior" />

  <java-symbol type="integer" name="config_toastDefaultGravity" />

  <java-symbol type="integer" name="config_wifi_framework_scan_interval" />

  <java-symbol type="integer" name="config_wifi_supplicant_scan_interval" />

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

+41 −5
Original line number Diff line number Diff line
@@ -134,6 +134,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    static final boolean ENABLE_CAR_DOCK_HOME_CAPTURE = true;

    static final boolean ENABLE_DESK_DOCK_HOME_CAPTURE = false;



    static final int SHORT_PRESS_POWER_NOTHING = 0;

    static final int SHORT_PRESS_POWER_GO_TO_SLEEP = 1;

    static final int SHORT_PRESS_POWER_REALLY_GO_TO_SLEEP = 2;

    static final int SHORT_PRESS_POWER_REALLY_GO_TO_SLEEP_AND_GO_HOME = 3;



    static final int LONG_PRESS_POWER_NOTHING = 0;

    static final int LONG_PRESS_POWER_GLOBAL_ACTIONS = 1;

    static final int LONG_PRESS_POWER_SHUT_OFF = 2;
@@ -291,6 +296,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    int mLidKeyboardAccessibility;

    int mLidNavigationAccessibility;

    boolean mLidControlsSleep;

    int mShortPressOnPowerBehavior = -1;

    int mLongPressOnPowerBehavior = -1;

    boolean mScreenOnEarly = false;

    boolean mScreenOnFully = false;
@@ -717,6 +723,33 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        mHandler.removeCallbacks(mScreenshotRunnable);

    }



    private void powerShortPress(long eventTime) {

        if (mShortPressOnPowerBehavior < 0) {

            mShortPressOnPowerBehavior = mContext.getResources().getInteger(

                    com.android.internal.R.integer.config_shortPressOnPowerBehavior);

        }



        switch (mShortPressOnPowerBehavior) {

            case SHORT_PRESS_POWER_NOTHING:

                break;

            case SHORT_PRESS_POWER_GO_TO_SLEEP:

                mPowerManager.goToSleep(eventTime,

                        PowerManager.GO_TO_SLEEP_REASON_USER, 0);

                break;

            case SHORT_PRESS_POWER_REALLY_GO_TO_SLEEP:

                mPowerManager.goToSleep(eventTime,

                        PowerManager.GO_TO_SLEEP_REASON_USER,

                        PowerManager.GO_TO_SLEEP_FLAG_NO_DOZE);

                break;

            case SHORT_PRESS_POWER_REALLY_GO_TO_SLEEP_AND_GO_HOME:

                mPowerManager.goToSleep(eventTime,

                        PowerManager.GO_TO_SLEEP_REASON_USER,

                        PowerManager.GO_TO_SLEEP_FLAG_NO_DOZE);

                launchHomeFromHotKey();

                break;

        }

    }



    private final Runnable mPowerLongPress = new Runnable() {

        @Override

        public void run() {
@@ -4009,7 +4042,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    mPowerKeyTriggered = false;

                    cancelPendingScreenshotChordAction();

                    if (interceptPowerKeyUp(canceled || mPendingPowerKeyUpCanceled)) {

                        mPowerManager.goToSleep(event.getEventTime());

                        powerShortPress(event.getEventTime());

                        isWakeKey = false;

                    }

                    mPendingPowerKeyUpCanceled = false;
@@ -4864,7 +4897,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { 


    private void applyLidSwitchState() {

        if (mLidState == LID_CLOSED && mLidControlsSleep) {

            mPowerManager.goToSleep(SystemClock.uptimeMillis());

            mPowerManager.goToSleep(SystemClock.uptimeMillis(),

                    PowerManager.GO_TO_SLEEP_REASON_USER,

                    PowerManager.GO_TO_SLEEP_FLAG_NO_DOZE);

        }

    }
@@ -5337,9 +5372,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                pw.print(mLidKeyboardAccessibility);

                pw.print(" mLidNavigationAccessibility="); pw.print(mLidNavigationAccessibility);

                pw.print(" mLidControlsSleep="); pw.println(mLidControlsSleep);

        pw.print(prefix); pw.print("mLongPressOnPowerBehavior=");

                pw.print(mLongPressOnPowerBehavior);

                pw.print(" mHasSoftInput="); pw.println(mHasSoftInput);

        pw.print(prefix);

                pw.print("mShortPressOnPowerBehavior="); pw.print(mShortPressOnPowerBehavior);

                pw.print(" mLongPressOnPowerBehavior="); pw.println(mLongPressOnPowerBehavior);

        pw.print(prefix); pw.print("mHasSoftInput="); pw.println(mHasSoftInput);

        pw.print(prefix); pw.print("mScreenOnEarly="); pw.print(mScreenOnEarly);

                pw.print(" mScreenOnFully="); pw.print(mScreenOnFully);

                pw.print(" mOrientationSensorEnabled="); pw.println(mOrientationSensorEnabled);