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

Commit 69ce71a1 authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "AOD Policy: Fix pausing timeout to use minutes instead of seconds" into oc-mr1-dev 

am: 14506c88

Change-Id: Ia7c5e551741107b04b4214a4a5e33fe982a68941
parents 27805ce0 14506c88

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

+3 −3
Original line number Diff line number Diff line
@@ -98,11 +98,11 @@ public class AlwaysOnDisplayPolicy { 
        }



        proxScreenOffDelayMs = mParser.getLong(KEY_PROX_SCREEN_OFF_DELAY_MS,

                10 * DateUtils.MINUTE_IN_MILLIS);

                10 * DateUtils.SECOND_IN_MILLIS);

        proxCooldownTriggerMs = mParser.getLong(KEY_PROX_COOLDOWN_TRIGGER_MS,

                2 * DateUtils.MINUTE_IN_MILLIS);

                2 * DateUtils.SECOND_IN_MILLIS);

        proxCooldownPeriodMs = mParser.getLong(KEY_PROX_COOLDOWN_PERIOD_MS,

                5 * DateUtils.MINUTE_IN_MILLIS);

                5 * DateUtils.SECOND_IN_MILLIS);

        screenBrightnessArray = parseIntArray(KEY_SCREEN_BRIGHTNESS_ARRAY,

                resources.getIntArray(R.array.config_doze_brightness_sensor_to_brightness));

        dimmingScrimArray = parseIntArray(KEY_DIMMING_SCRIM_ARRAY,

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

+3 −3
Original line number Diff line number Diff line
@@ -61,9 +61,9 @@ public class AlwaysOnDisplayPolicyTest extends SysuiTestCase { 


        AlwaysOnDisplayPolicy policy = new AlwaysOnDisplayPolicy(mContext);



        assertThat(policy.proxScreenOffDelayMs).isEqualTo(10 * DateUtils.MINUTE_IN_MILLIS);

        assertThat(policy.proxCooldownTriggerMs).isEqualTo(2 * DateUtils.MINUTE_IN_MILLIS);

        assertThat(policy.proxCooldownPeriodMs).isEqualTo(5 * DateUtils.MINUTE_IN_MILLIS);

        assertThat(policy.proxScreenOffDelayMs).isEqualTo(10 * DateUtils.SECOND_IN_MILLIS);

        assertThat(policy.proxCooldownTriggerMs).isEqualTo(2 * DateUtils.SECOND_IN_MILLIS);

        assertThat(policy.proxCooldownPeriodMs).isEqualTo(5 * DateUtils.SECOND_IN_MILLIS);

        assertThat(policy.screenBrightnessArray).isEqualTo(mContext.getResources().getIntArray(

                R.array.config_doze_brightness_sensor_to_brightness));

        assertThat(policy.dimmingScrimArray).isEqualTo(mContext.getResources().getIntArray(