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

Commit ed06df13 authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

am 1bd81e31: Merge "Doze: Make proximity check configurable." into lmp-mr1-dev 

* commit '1bd81e31':
  Doze: Make proximity check configurable.
parents b2b8dcba 1bd81e31

packages/SystemUI/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -232,6 +232,9 @@ 
    <!-- Doze: should the pickup sensor be used as a pulse signal? -->

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



    <!-- Doze: check proximity sensor before pulsing? -->

    <bool name="doze_proximity_check_before_pulse">true</bool>



    <!-- Doze: should notifications be used as a pulse signal? -->

    <bool name="doze_pulse_on_notifications">true</bool>

packages/SystemUI/src/com/android/systemui/doze/DozeService.java

+27 −17
Original line number Diff line number Diff line
@@ -202,6 +202,12 @@ 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()) {

                // skip proximity check

                continuePulsing();

                return;

            }

            // perform a proximity check before pulsing

            final long start = SystemClock.uptimeMillis();

            new ProximityCheck() {

                @Override
@@ -216,6 +222,13 @@ public class DozeService extends DreamService { 
                    }



                    // not in-pocket, continue pulsing

                    continuePulsing();

                }

            }.check();

        }

    }



    private void continuePulsing() {

        mHost.pulseWhileDozing(new DozeHost.PulseCallback() {

            @Override

            public void onPulseStarted() {
@@ -234,9 +247,6 @@ public class DozeService extends DreamService { 
            }

        });

    }

            }.check();

        }

    }



    private void turnDisplayOff() {

        if (DEBUG) Log.d(mTag, "Display off");

packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java

+5 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 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("    getPulseOnNotifications(): "); pw.println(getPulseOnNotifications());

        pw.print("    getPulseSchedule(): "); pw.println(getPulseSchedule());

        pw.print("    getPulseScheduleResets(): "); pw.println(getPulseScheduleResets());
@@ -101,6 +102,10 @@ 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 getPulseOnNotifications() {

        return getBoolean("doze.pulse.notifications", R.bool.doze_pulse_on_notifications);

    }