Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Cassie Han
2018-03-09 20:29:41 +00:00
committed by Gerrit Code Review
parent 9b8008e9e8 08941a5f3e
commit fdbc592178
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/res/values/config.xml
View File

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

1
core/res/res/values/symbols.xml
View File

@@ -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" />