summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Joe LaPenna <jlapenna@google.com> 2016-12-12 21:34:30 +0000
committer android-build-merger <android-build-merger@google.com> 2016-12-12 21:34:30 +0000
commitb52989c736b3278f1ab5f6a9db8e555f40b99585 (patch)
treeb6718477f524d19538eb72066aaf21d428f9b032
parent5226bbb5a61046c90f2f1a14919d1f2ba3a460ad (diff)
parent2bc66bf601081928fb46e2727ec6d825f128bf26 (diff)
Merge "Add simplified_network_settings_bool to CarrierConfigManager." am: 9b430e0395
am: 2bc66bf601 Change-Id: Idaa23641c8e95890271c554dee0244702601a109
-rw-r--r--telephony/java/android/telephony/CarrierConfigManager.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index c82b87ae47c6..7113236f2981 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -143,6 +143,14 @@ public class CarrierConfigManager {
public static final String
KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL = "hide_carrier_network_settings_bool";
+ /**
+ * Control whether users receive a simplified network settings UI and improved network
+ * selection.
+ * @hide
+ */
+ public static final String
+ KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL = "simplified_network_settings_bool";
+
/** Control whether users can reach the SIM lock settings. */
public static final String
KEY_HIDE_SIM_LOCK_SETTINGS_BOOL = "hide_sim_lock_settings_bool";
@@ -1082,6 +1090,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL, true);
sDefaults.putBoolean(KEY_HAS_IN_CALL_NOISE_SUPPRESSION_BOOL, false);
sDefaults.putBoolean(KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL, false);
+ sDefaults.putBoolean(KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL, false);
sDefaults.putBoolean(KEY_HIDE_SIM_LOCK_SETTINGS_BOOL, false);
sDefaults.putBoolean(KEY_IGNORE_SIM_NETWORK_LOCKED_EVENTS_BOOL, false);
sDefaults.putBoolean(KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);