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

Commit 8dad62c3 authored by Oleksandr Byelkin's avatar Oleksandr Byelkin Committed by Danesh M
Browse files

Answer call with hardware HOME button (2/2) 

preparation to winter time
OPO-368

Change-Id: I1d54388cdaf478533bea7ef89d7d21c8f8af3f52
parent 4c00159a

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

+21 −2
Original line number Diff line number Diff line
@@ -656,6 +656,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    // (See Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR.)

    int mIncallPowerBehavior;



    // Behavior of HOME button during incomming call ring.

    // (See Settings.Secure.RING_HOME_BUTTON_BEHAVIOR.)

    int mRingHomeBehavior;



    Display mDisplay;



    private int mDisplayRotation;
@@ -834,6 +838,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            resolver.registerContentObserver(Settings.Secure.getUriFor(

                    Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR), false, this,

                    UserHandle.USER_ALL);

            resolver.registerContentObserver(CMSettings.Secure.getUriFor(

                            CMSettings.Secure.RING_HOME_BUTTON_BEHAVIOR), false, this,

                    UserHandle.USER_ALL);

            resolver.registerContentObserver(Settings.Secure.getUriFor(

                    Settings.Secure.WAKE_GESTURE_ENABLED), false, this,

                    UserHandle.USER_ALL);
@@ -2138,6 +2145,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR,

                    Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_DEFAULT,

                    UserHandle.USER_CURRENT);

            mRingHomeBehavior = CMSettings.Secure.getIntForUser(resolver,

                    CMSettings.Secure.RING_HOME_BUTTON_BEHAVIOR,

                    CMSettings.Secure.RING_HOME_BUTTON_BEHAVIOR_DEFAULT,

                    UserHandle.USER_CURRENT);

            mHomeWakeScreen = (CMSettings.System.getIntForUser(resolver,

                    CMSettings.System.HOME_WAKE_SCREEN, 1, UserHandle.USER_CURRENT) == 1) &&

                    ((mDeviceHardwareWakeKeys & KEY_MASK_HOME) != 0);
@@ -3229,9 +3240,16 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                // and his ONLY options are to answer or reject the call.)

                TelecomManager telecomManager = getTelecommService();

                if (telecomManager != null && telecomManager.isRinging()) {

                    if ((mRingHomeBehavior

                            & CMSettings.Secure.RING_HOME_BUTTON_BEHAVIOR_ANSWER) != 0) {

                        Log.i(TAG, "Answering with HOME button.");

                        telecomManager.acceptRingingCall();

                        return -1;

                    } else {

                        Log.i(TAG, "Ignoring HOME; there's a ringing incoming call.");

                        return -1;

                    }

                }



                // Delay handling home if a double-tap is possible.

                if (mDoubleTapOnHomeBehavior != KEY_ACTION_NOTHING) {
@@ -7828,6 +7846,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        pw.print(prefix);

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

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

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

        pw.print(prefix);

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

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