commit 38c58552d3d082092fc7b19ce01dfa68dd53e111
author Jonathan Basseri <misterikkit@google.com> Tue Jun 09 15:14:06 2015 -0700
committer Jonathan Basseri <misterikkit@google.com> Wed Jun 10 20:58:27 2015 -0700
tree 9884302a1dc420feb10d0c755384b0a74598efe9
parent 5086066954e8f237679f76ca952f7b403a734fd9

Rename KEY_VOICE_PRIVACY_DISABLE_BOOL -> KEY_VOICE_PRIVACY_DISABLE_UI_BOOL

Disabling voice privacy sounds scary. Update this config variable name
to what it actually does, which is to hide some settings UI.

Bug: 21571894
Change-Id: I165f9e91cee6b7c7572d8540d63519f1454ece9e

src/com/android/phone/CallFeaturesSetting.java

diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index d3d9dcf..a083b7f 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -243,7 +243,7 @@
                     prefSet.removePreference(fdnButton);
 
                     if (!carrierConfig.getBoolean(
-                            CarrierConfigManager.KEY_VOICE_PRIVACY_DISABLE_BOOL)) {
+                            CarrierConfigManager.KEY_VOICE_PRIVACY_DISABLE_UI_BOOL)) {
                         addPreferencesFromResource(R.xml.cdma_call_privacy);
                     }
                 } else if (phoneType == PhoneConstants.PHONE_TYPE_GSM) {

src/com/android/phone/CdmaCallOptions.java

diff --git a/src/com/android/phone/CdmaCallOptions.java b/src/com/android/phone/CdmaCallOptions.java
index 9131ad6..4a5f229 100644
--- a/src/com/android/phone/CdmaCallOptions.java
+++ b/src/com/android/phone/CdmaCallOptions.java
@@ -59,7 +59,7 @@
             carrierConfig = PhoneGlobals.getInstance().getCarrierConfig();
         }
         if (subInfoHelper.getPhone().getPhoneType() != PhoneConstants.PHONE_TYPE_CDMA
-                || carrierConfig.getBoolean(CarrierConfigManager.KEY_VOICE_PRIVACY_DISABLE_BOOL)) {
+                || carrierConfig.getBoolean(CarrierConfigManager.KEY_VOICE_PRIVACY_DISABLE_UI_BOOL)) {
             // disable the entire screen
             getPreferenceScreen().setEnabled(false);
         }