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

Commit d2af95d0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update TriggerSensor parameters" into sc-v2-dev am: 612d6cad am: ee9b0927 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16295320

Change-Id: Iab18f4dc24903f3121ab8c05ac67db5d672e2e2d
parents df12c108 ee9b0927

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

+3 −3
Original line number Diff line number Diff line
@@ -513,10 +513,10 @@ public class DozeSensors { 
                    true /* settingDef */,

                    configured,

                    pulseReason,

                    false /* ignoresSetting */,

                    false /* requiresProx */,

                    reportsTouchCoordinates,

                    requiresTouchscreen

                    requiresTouchscreen,

                    false /* ignoresSetting */,

                    false /* requiresProx */

            );

        }

packages/SystemUI/tests/src/com/android/systemui/doze/DozeSensorsTest.java

+12 −0
Original line number Diff line number Diff line
@@ -420,6 +420,18 @@ public class DozeSensorsTest extends SysuiTestCase { 
        assertTrue(triggerSensor.mRegistered);

    }



    @Test

    public void testGesturesAllInitiallyRespectSettings() {

        DozeSensors dozeSensors = new DozeSensors(getContext(), mSensorManager, mDozeParameters,

                mAmbientDisplayConfiguration, mWakeLock, mCallback, mProxCallback, mDozeLog,

                mProximitySensor, mFakeSettings, mAuthController,

                mDevicePostureController);



        for (TriggerSensor sensor : dozeSensors.mTriggerSensors) {

            assertFalse(sensor.mIgnoresSetting);

        }

    }



    private class TestableDozeSensors extends DozeSensors {

        TestableDozeSensors() {

            super(getContext(), mSensorManager, mDozeParameters,