PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Settings] hide preferred network mode UI" into qt-r1-dev am: 7afb9854a7

Browse Source 
am: b5617b6f21

Change-Id: Ia137a3f3454cff7af7c3aa7195eb89c049fadaf2
This commit is contained in:
Jayachandran Chinnakkannu
2019-08-26 11:39:22 -07:00
committed by android-build-merger
parent 3f81ee5f55 b5617b6f21
commit f51fdf64a9
4 changed files with 54 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
View File

@@ -81,13 +81,9 @@ public class EnabledNetworkModePreferenceController extends
} else if (carrierConfig == null) {
visible = false;
} else if (carrierConfig.getBoolean(
CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL)) {
visible = false;
} else if (carrierConfig.getBoolean(
CarrierConfigManager.KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL)
&& !telephonyManager.getServiceState().getRoaming()
&& telephonyManager.getServiceState().getDataRegState()
== ServiceState.STATE_IN_SERVICE) {
CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL)
|| carrierConfig.getBoolean(
CarrierConfigManager.KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL)) {
visible = false;
} else if (carrierConfig.getBoolean(CarrierConfigManager.KEY_WORLD_PHONE_BOOL)) {
visible = false;

10
src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
View File

@@ -58,13 +58,9 @@ public class PreferredNetworkModePreferenceController extends TelephonyBasePrefe
} else if (carrierConfig == null) {
visible = false;
} else if (carrierConfig.getBoolean(
CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL)) {
visible = false;
} else if (carrierConfig.getBoolean(
CarrierConfigManager.KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL)
&& !telephonyManager.getServiceState().getRoaming()
&& telephonyManager.getServiceState().getDataRegState()
== ServiceState.STATE_IN_SERVICE) {
CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL)
|| carrierConfig.getBoolean(
CarrierConfigManager.KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL)) {
visible = false;
} else if (carrierConfig.getBoolean(CarrierConfigManager.KEY_WORLD_PHONE_BOOL)) {
visible = true;