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

Commit b2f9bc28 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:... 

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

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



Change-Id: Iec04612eb61ae074eb3a76e4a0526ade06858302
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6ad44a9d bcce2028

packages/SystemUI/res/values/config.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -782,6 +782,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>