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

Commit de4be3fc authored by Ben Murdoch's avatar Ben Murdoch Committed by Automerger Merge Worker
Browse files

Merge "Move config_useKeyguardUserSwitcher from sysui overlay to framework."... 

Merge "Move config_useKeyguardUserSwitcher from sysui overlay to framework." into rvc-dev am: 801f1292 am: 68ccc413 am: 76b81051 am: f9e0331d

Change-Id: I6718437bc9bebf82b94ad8ad8a5c19d9b54032bf
parents de27c267 f9e0331d

core/res/res/values-sw600dp/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -45,5 +45,8 @@ 
    <!-- Controls whether the nav bar can move from the bottom to the side in landscape.

         Only applies if the device display is not square. -->

    <bool name="config_navBarCanMove">false</bool>



    <!-- Set to true to enable the user switcher on the keyguard. -->

    <bool name="config_keyguardUserSwitcher">true</bool>

</resources>

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -4420,4 +4420,8 @@ 
    <!-- Package name that will receive an explicit manifest broadcast for

         android.os.action.POWER_SAVE_MODE_CHANGED. -->

    <string name="config_powerSaveModeChangedListenerPackage" translatable="false"></string>



    <!-- Set to true to enable the user switcher on the keyguard. -->

    <bool name="config_keyguardUserSwitcher">false</bool>



</resources>

core/res/res/values/symbols.xml

+3 −0
Original line number Diff line number Diff line
@@ -3940,4 +3940,7 @@ 
  <java-symbol type="string" name="config_customSessionPolicyProvider" />

  <!-- The max scale for the wallpaper when it's zoomed in -->

  <java-symbol type="dimen" name="config_wallpaperMaxScale"/>



  <!-- Set to true to enable the user switcher on the keyguard. -->

  <java-symbol type="bool" name="config_keyguardUserSwitcher" />

</resources>

packages/SystemUI/res/values-sw600dp/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -26,9 +26,6 @@ 
    <!-- The number of columns that the top level tiles span in the QuickSettings -->

    <integer name="quick_settings_user_time_settings_tile_span">1</integer>



    <!-- Set to true to enable the user switcher on the keyguard. -->

    <bool name="config_keyguardUserSwitcher">true</bool>



    <!-- Nav bar button default ordering/layout -->

    <string name="config_navBarLayout" translatable="false">left;back,home,recent;right</string>

packages/SystemUI/res/values/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -175,9 +175,6 @@ 
         be 'platform' or 'noisy' (i.e. for noisy touch screens). -->

    <string name="velocity_tracker_impl" translatable="false">platform</string>



    <!-- Set to true to enable the user switcher on the keyguard. -->

    <bool name="config_keyguardUserSwitcher">false</bool>



    <!-- Doze: does this device support STATE_DOZE?  -->

    <bool name="doze_display_state_supported">false</bool>