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

Merge "Add config_carrier_wfc_ims_available to config.xml"

Browse Source 
am: d1d682e446

Change-Id: I78e496cd8d01f283cfb9a737b155b0dab4984b67
This commit is contained in:
Jordan Liu
2016-09-30 18:50:24 +00:00
committed by android-build-merger
parent 63224d9ea3 d1d682e446
commit 4fe680f920
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2157,6 +2157,11 @@
<!-- Flag specifying whether WFC over IMS is available on device --> <!-- Flag specifying whether WFC over IMS is available on device -->
<bool name="config_device_wfc_ims_available">false</bool> <bool name="config_device_wfc_ims_available">false</bool>
<!-- Flag specifying whether WFC over IMS should be available for carrier: independent of
carrier provisioning. If false: hard disabled. If true: then depends on carrier
provisioning, availability etc -->
<bool name="config_carrier_wfc_ims_available">false</bool>
<bool name="config_networkSamplingWakesDevice">true</bool> <bool name="config_networkSamplingWakesDevice">true</bool>
<string-array translatable="false" name="config_cdma_home_system" /> <string-array translatable="false" name="config_cdma_home_system" />

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

@@ -2195,6 +2195,7 @@
<java-symbol type="bool" name="config_device_vt_available" /> <java-symbol type="bool" name="config_device_vt_available" />
<java-symbol type="bool" name="config_carrier_vt_available" /> <java-symbol type="bool" name="config_carrier_vt_available" />
<java-symbol type="bool" name="config_device_wfc_ims_available" /> <java-symbol type="bool" name="config_device_wfc_ims_available" />
<java-symbol type="bool" name="config_carrier_wfc_ims_available" />
<java-symbol type="attr" name="touchscreenBlocksFocus" /> <java-symbol type="attr" name="touchscreenBlocksFocus" />
<java-symbol type="layout" name="resolver_list_with_default" /> <java-symbol type="layout" name="resolver_list_with_default" />
<java-symbol type="string" name="whichApplicationNamed" /> <java-symbol type="string" name="whichApplicationNamed" />