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

Commit 0cd805a3 authored by Cassie Han's avatar Cassie Han Committed by android-build-merger
Browse files

Merge "Cherrypick "Add device config to decide which Auto Selection Network UI to use."" 

am: fdbc5921

Change-Id: I2efd5b172f00d78f90333aa8168c52ae035a918d
parents ff4dd75b fdbc5921

core/res/res/values/config.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -2093,6 +2093,9 @@ 
    <!-- Whether UI for multi user should be shown -->

    <!-- Whether UI for multi user should be shown -->

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

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





    <!-- Whether the new Auto Selection Network UI should be shown -->

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



    <!-- If true, then we do not ask user for permission for apps to connect to USB devices.

    <!-- If true, then we do not ask user for permission for apps to connect to USB devices.

         Do not set this to true for production devices. Doing so will cause you to fail CTS. -->

         Do not set this to true for production devices. Doing so will cause you to fail CTS. -->

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

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

core/res/res/values/symbols.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -311,6 +311,7 @@ 
  <java-symbol type="bool" name="config_forceDefaultOrientation" />

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

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

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

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

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

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

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

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

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

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

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

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