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

Commit bcce2028 authored by William Xiao's avatar William Xiao Committed by Automerger Merge Worker
Browse files

Merge "Add configuration for default timeout to dock user" into tm-qpr-dev am: aff1ea79 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20685295



Change-Id: Ibeefe3a7054bd4ad0a8fb632a0921aa1f36c1120
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 080ac0f1 aff1ea79

packages/SystemUI/res/values/config.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -779,6 +779,10 @@ 
    <!-- Duration in milliseconds of the y-translation animation when entering a dream -->

    <!-- Duration in milliseconds of the y-translation animation when entering a dream -->

    <integer name="config_dreamOverlayInTranslationYDurationMs">917</integer>

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

    <!-- Icons that don't show in a collapsed non-keyguard statusbar -->

    <string-array name="config_collapsed_statusbar_icon_blocklist" translatable="false">

    <string-array name="config_collapsed_statusbar_icon_blocklist" translatable="false">

        <item>@*android:string/status_bar_volume</item>

        <item>@*android:string/status_bar_volume</item>