diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java b/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java index dd94a75c55c60..239109af7a3d8 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java @@ -513,10 +513,10 @@ public class DozeSensors { true /* settingDef */, configured, pulseReason, - false /* ignoresSetting */, - false /* requiresProx */, reportsTouchCoordinates, - requiresTouchscreen + requiresTouchscreen, + false /* ignoresSetting */, + false /* requiresProx */ ); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeSensorsTest.java b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeSensorsTest.java index 4ccb92609c77d..f207b9eb7e541 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeSensorsTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeSensorsTest.java @@ -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,