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

Commit baf1ea91 authored by Justin Chung's avatar Justin Chung Committed by Android (Google) Code Review
Browse files

Merge "services: silence ringer with SLEEP key" into main

parents c4f59c9a dbd843f6

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -1185,6 +1185,9 @@ 
    -->

    <integer name="config_shortPressOnSleepBehavior">0</integer>



    <!-- Whether to silence telephony ringer on sleep key event -->

    <bool name="config_silenceRingerOnSleepKey">false</bool>



    <!-- Control the behavior when the user long presses the stem primary button.

         Stem primary button is only used on watch form factor. If a device is not

         a watch, setting this config is no-op.

core/res/res/values/symbols.xml

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

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

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

  <java-symbol type="bool" name="config_silenceRingerOnSleepKey" />

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

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

  <java-symbol type="string" name="config_primaryShortPressTargetActivity" />

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

+12 −0
Original line number Diff line number Diff line
@@ -559,6 +559,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    boolean mWakeOnDpadKeyPress;

    boolean mWakeOnAssistKeyPress;

    boolean mWakeOnBackKeyPress;

    boolean mSilenceRingerOnSleepKey;

    long mWakeUpToLastStateTimeout;

    int mSearchKeyBehavior;

    ComponentName mSearchKeyTargetActivity;
@@ -1423,6 +1424,15 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    }



    private void sleepRelease(long eventTime) {

        if (mSilenceRingerOnSleepKey) {

            TelecomManager telecomManager = getTelecommService();

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

                telecomManager.silenceRinger();

                Slog.i(TAG, "sleepRelease() silence ringer");

                return;

            }

        }



        switch (mShortPressOnSleepBehavior) {

            case SHORT_PRESS_SLEEP_GO_TO_SLEEP:

            case SHORT_PRESS_SLEEP_GO_TO_SLEEP_AND_GO_HOME:
@@ -2347,6 +2357,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                com.android.internal.R.string.config_primaryShortPressTargetActivity));

        mShortPressOnSleepBehavior = mContext.getResources().getInteger(

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

        mSilenceRingerOnSleepKey = mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_silenceRingerOnSleepKey);

        mAllowStartActivityForLongPressOnPowerDuringSetup = mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_allowStartActivityForLongPressOnPowerInSetup);