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

Merge "Changing user inactivity and warning dialog timeouts" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-08-16 00:21:34 +00:00
committed by Android (Google) Code Review
parent ab35493046 cafdc2e50d
commit f5e51cf7a9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java
View File

@@ -89,8 +89,8 @@ public class RetailDemoModeService extends SystemService {
private static final long SCREEN_WAKEUP_DELAY = 2500;
private static final long USER_INACTIVITY_TIMEOUT_MIN = 10000;
private static final long USER_INACTIVITY_TIMEOUT_DEFAULT = 30000;
private static final long WARNING_DIALOG_TIMEOUT_DEFAULT = 6000;
private static final long USER_INACTIVITY_TIMEOUT_DEFAULT = 90000;
private static final long WARNING_DIALOG_TIMEOUT_DEFAULT = 0;
private static final long MILLIS_PER_SECOND = 1000;
private static final int[] VOLUME_STREAMS_TO_MUTE = {