diff options
Diffstat (limited to 'packages')
3 files changed, 15 insertions, 5 deletions
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 1967134..82cf8c6 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -239,6 +239,9 @@ <!-- Doze: check proximity sensor before pulsing? --> <bool name="doze_proximity_check_before_pulse">true</bool> + <!-- Doze: check proximity sensor before pulsing from intent? --> + <bool name="doze_proximity_check_before_pulse_intent">false</bool> + <!-- Doze: should notifications be used as a pulse signal? --> <bool name="doze_pulse_on_notifications">true</bool> diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeService.java b/packages/SystemUI/src/com/android/systemui/doze/DozeService.java index 4759538..2ac8528 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeService.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeService.java @@ -217,8 +217,7 @@ public class DozeService extends DreamService { // Here we need a wakelock to stay awake until the pulse is finished. mWakeLock.acquire(); mPulsing = true; - if (!mDozeParameters.getProxCheckBeforePulse() || - reason == DozeLog.PULSE_REASON_INTENT) { + if (!mDozeParameters.getProxCheckBeforePulse(reason)) { // skip proximity check continuePulsing(reason); return; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java index d995f75..ef3ad10 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java @@ -62,7 +62,8 @@ public class DozeParameters { pw.print(" getVibrateOnSigMotion(): "); pw.println(getVibrateOnSigMotion()); pw.print(" getPulseOnPickup(): "); pw.println(getPulseOnPickup()); pw.print(" getVibrateOnPickup(): "); pw.println(getVibrateOnPickup()); - pw.print(" getProxCheckBeforePulse(): "); pw.println(getProxCheckBeforePulse()); + pw.print(" getProxCheckBeforePulse(pickup): "); pw.println(getProxCheckBeforePulse(DozeLog.PULSE_REASON_SENSOR_PICKUP)); + pw.print(" getProxCheckBeforePulse(intent): "); pw.println(getProxCheckBeforePulse(DozeLog.PULSE_REASON_INTENT)); pw.print(" getPulseOnNotifications(): "); pw.println(getPulseOnNotifications()); pw.print(" getPulseSchedule(): "); pw.println(getPulseSchedule()); pw.print(" getPulseScheduleResets(): "); pw.println(getPulseScheduleResets()); @@ -124,8 +125,15 @@ public class DozeParameters { return SystemProperties.getBoolean("doze.vibrate.pickup", false); } - public boolean getProxCheckBeforePulse() { - return getBoolean("doze.pulse.proxcheck", R.bool.doze_proximity_check_before_pulse); + public boolean getProxCheckBeforePulse(int reason) { + switch(reason) { + case DozeLog.PULSE_REASON_SENSOR_PICKUP: + return getBoolean("doze.pulse.proxcheck.pickup", R.bool.doze_proximity_check_before_pulse); + case DozeLog.PULSE_REASON_INTENT: + return getBoolean("doze.pulse.proxcheck.intent", R.bool.doze_proximity_check_before_pulse_intent); + default: + return getBoolean("doze.pulse.proxcheck", R.bool.doze_proximity_check_before_pulse); + } } public boolean getPickupPerformsProxCheck() { |