Merge "Add configuration for default timeout to dock user" into tm-qpr-dev am: aff1ea79df am: bcce20282a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20685295 Change-Id: Iec04612eb61ae074eb3a76e4a0526ade06858302 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -782,6 +782,10 @@
|
||||
<!-- Duration in milliseconds of the y-translation animation when entering a dream -->
|
||||
<integer name="config_dreamOverlayInTranslationYDurationMs">917</integer>
|
||||
|
||||
<!-- Delay in milliseconds before switching to the dock user and dreaming if a secondary user is
|
||||
active when the device is locked and docked. 0 indicates disabled. Default is 1 minute. -->
|
||||
<integer name="config_defaultDockUserTimeoutMs">60000</integer>
|
||||
|
||||
<!-- Icons that don't show in a collapsed non-keyguard statusbar -->
|
||||
<string-array name="config_collapsed_statusbar_icon_blocklist" translatable="false">
|
||||
<item>@*android:string/status_bar_volume</item>
|
||||
|
||||
Reference in New Issue
Block a user