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

Merge changes from topic "move-inflate-ss-to-cc" am: 922e9bfd95

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1219720

Change-Id: Ia3b10d7b602819e150cd4c0d7736ad8da446519b
This commit is contained in:
Sooraj Sasindran
2020-08-11 00:21:29 +00:00
committed by Automerger Merge Worker
parent b6bd23c222 922e9bfd95
commit 1e14220da2
13 changed files with 1 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/res/res/values-mcc310-mnc030/config.xml
View File

@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2019, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
<!-- Enable 5 bar signal strength icon -->
<bool name="config_inflateSignalStrength">true</bool>
</resources>

26
core/res/res/values-mcc310-mnc070/config.xml
View File

@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2019, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
<!-- Enable 5 bar signal strength icon -->
<bool name="config_inflateSignalStrength">true</bool>
</resources>

3
core/res/res/values-mcc310-mnc170/config.xml
View File

@@ -20,9 +20,6 @@
<!-- These resources are around just to allow their values to be customized <!-- These resources are around just to allow their values to be customized
for different hardware and product builds. --> for different hardware and product builds. -->
<resources> <resources>
<!-- Enable 5 bar signal strength icon -->
<bool name="config_inflateSignalStrength">true</bool>
<!-- Boolean indicating whether frameworks needs to reset cell broadcast geo-fencing <!-- Boolean indicating whether frameworks needs to reset cell broadcast geo-fencing
check after reboot or airplane mode toggling --> check after reboot or airplane mode toggling -->
<bool translatable="false" name="reset_geo_fencing_check_after_boot_or_apm">true</bool> <bool translatable="false" name="reset_geo_fencing_check_after_boot_or_apm">true</bool>

26
core/res/res/values-mcc310-mnc280/config.xml
View File

@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2019, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
<!-- Enable 5 bar signal strength icon -->
<bool name="config_inflateSignalStrength">true</bool>
</resources>

3
core/res/res/values-mcc310-mnc380/config.xml
View File

@@ -20,9 +20,6 @@
<!-- These resources are around just to allow their values to be customized <!-- These resources are around just to allow their values to be customized
for different hardware and product builds. --> for different hardware and product builds. -->
<resources> <resources>
<!-- Enable 5 bar signal strength icon -->
<bool name="config_inflateSignalStrength">true</bool>
<!-- Boolean indicating whether frameworks needs to reset cell broadcast geo-fencing <!-- Boolean indicating whether frameworks needs to reset cell broadcast geo-fencing
check after reboot or airplane mode toggling --> check after reboot or airplane mode toggling -->
<bool translatable="false" name="reset_geo_fencing_check_after_boot_or_apm">true</bool> <bool translatable="false" name="reset_geo_fencing_check_after_boot_or_apm">true</bool>

3
core/res/res/values-mcc310-mnc410/config.xml
View File

@@ -49,9 +49,6 @@
<item>"#9"</item> <item>"#9"</item>
</string-array> </string-array>
<!-- Enable 5 bar signal strength icon -->
<bool name="config_inflateSignalStrength">true</bool>
<!-- Boolean indicating whether frameworks needs to reset cell broadcast geo-fencing <!-- Boolean indicating whether frameworks needs to reset cell broadcast geo-fencing
check after reboot or airplane mode toggling --> check after reboot or airplane mode toggling -->
<bool translatable="false" name="reset_geo_fencing_check_after_boot_or_apm">true</bool> <bool translatable="false" name="reset_geo_fencing_check_after_boot_or_apm">true</bool>

3
core/res/res/values-mcc310-mnc560/config.xml
View File

@@ -20,9 +20,6 @@
<!-- These resources are around just to allow their values to be customized <!-- These resources are around just to allow their values to be customized
for different hardware and product builds. --> for different hardware and product builds. -->
<resources> <resources>
<!-- Enable 5 bar signal strength icon -->
<bool name="config_inflateSignalStrength">true</bool>
<!-- Boolean indicating whether frameworks needs to reset cell broadcast geo-fencing <!-- Boolean indicating whether frameworks needs to reset cell broadcast geo-fencing
check after reboot or airplane mode toggling --> check after reboot or airplane mode toggling -->
<bool translatable="false" name="reset_geo_fencing_check_after_boot_or_apm">true</bool> <bool translatable="false" name="reset_geo_fencing_check_after_boot_or_apm">true</bool>

26
core/res/res/values-mcc310-mnc950/config.xml
View File

@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2019, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
<!-- Enable 5 bar signal strength icon -->
<bool name="config_inflateSignalStrength">true</bool>
</resources>

3
core/res/res/values-mcc311-mnc180/config.xml
View File

@@ -20,9 +20,6 @@
<!-- These resources are around just to allow their values to be customized <!-- These resources are around just to allow their values to be customized
for different hardware and product builds. --> for different hardware and product builds. -->
<resources> <resources>
<!-- Enable 5 bar signal strength icon -->
<bool name="config_inflateSignalStrength">true</bool>
<!-- Boolean indicating whether frameworks needs to reset cell broadcast geo-fencing <!-- Boolean indicating whether frameworks needs to reset cell broadcast geo-fencing
check after reboot or airplane mode toggling --> check after reboot or airplane mode toggling -->
<bool translatable="false" name="reset_geo_fencing_check_after_boot_or_apm">true</bool> <bool translatable="false" name="reset_geo_fencing_check_after_boot_or_apm">true</bool>

3
core/res/res/values-mcc311-mnc480/config.xml
View File

@@ -40,7 +40,4 @@
<bool name="config_use_sim_language_file">true</bool> <bool name="config_use_sim_language_file">true</bool>
<!-- Enable 5 bar signal strength icon -->
<bool name="config_inflateSignalStrength">true</bool>
</resources> </resources>

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

@@ -4351,10 +4351,6 @@
only. The component must be part of a system app. --> only. The component must be part of a system app. -->
<string name="config_defaultSupervisionProfileOwnerComponent" translatable="false"></string> <string name="config_defaultSupervisionProfileOwnerComponent" translatable="false"></string>
<!-- Whether to artificially interpret all signal strengths as
one bar higher than they actually are -->
<bool name="config_inflateSignalStrength">false</bool>
<!-- Contains a blacklist of apps that should not get pre-installed carrier app permission <!-- Contains a blacklist of apps that should not get pre-installed carrier app permission
grants, even if the UICC claims that the app should be privileged. See b/138150105 --> grants, even if the UICC claims that the app should be privileged. See b/138150105 -->
<string-array name="config_restrictedPreinstalledCarrierApps" translatable="false"/> <string-array name="config_restrictedPreinstalledCarrierApps" translatable="false"/>

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

@@ -3860,7 +3860,6 @@
<java-symbol type="color" name="decor_view_status_guard_light" /> <java-symbol type="color" name="decor_view_status_guard_light" />
<java-symbol type="string" name="config_defaultSupervisionProfileOwnerComponent" /> <java-symbol type="string" name="config_defaultSupervisionProfileOwnerComponent" />
<java-symbol type="bool" name="config_inflateSignalStrength" />
<java-symbol type="array" name="config_restrictedPreinstalledCarrierApps" /> <java-symbol type="array" name="config_restrictedPreinstalledCarrierApps" />
<java-symbol type="array" name="config_highRefreshRateBlacklist" /> <java-symbol type="array" name="config_highRefreshRateBlacklist" />

2
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -1087,7 +1087,7 @@ public class CarrierConfigManager {
/** /**
* Flag specifying if we should interpret all signal strength as one bar higher * Flag specifying if we should interpret all signal strength as one bar higher
* This is a replacement for the resource config_inflateSignalStrength * This is a replacement for the former resource config_inflateSignalStrength
* The default value is false. * The default value is false.
* @hide * @hide
*/ */