Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 14506c8806

Change-Id: Ia7c5e551741107b04b4214a4a5e33fe982a68941
This commit is contained in:
Adrian Roos
2017-09-05 15:59:16 +00:00
committed by android-build-merger
parent 27805ce0b1 14506c8806
commit 69ce71a11c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/doze/AlwaysOnDisplayPolicy.java
View File

@@ -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,

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

@@ -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(