commit 3649bdb5813200904d4e887306dfebb1a0beffa8
author Jonathan Basseri <misterikkit@google.com> Thu Apr 30 22:39:11 2015 -0700
committer Jonathan Basseri <misterikkit@google.com> Fri May 01 11:32:53 2015 -0700
tree 0200d2de80720e2a301e1b0eccff7a893430cdd0
parent 7060fbfbc3528f7f78cb8811820bb9d02cf771ba

Migrating more code to read config from CarrierConfigManager.

The following variables are now being read through the carrier config API.
config_voice_privacy_disable
config_show_onscreen_dial_button
config_enable_dialer_key_vibration
sim_network_unlock_allow_dismiss
voicemail_notification_persistent

Bug: 20270007
Change-Id: I4dc909ae32c23fc3f62c5d151ac2b19ef49dffe5

src/com/android/phone/EmergencyDialer.java

diff --git a/src/com/android/phone/EmergencyDialer.java b/src/com/android/phone/EmergencyDialer.java
index c7dd1e9..e25d91f 100644
--- a/src/com/android/phone/EmergencyDialer.java
+++ b/src/com/android/phone/EmergencyDialer.java
@@ -31,6 +31,7 @@
 import android.os.Bundle;
 import android.provider.Settings;
 import android.telecom.PhoneAccount;
+import android.telephony.CarrierConfigManager;
 import android.telephony.PhoneNumberUtils;
 import android.text.Editable;
 import android.text.TextUtils;
@@ -198,8 +199,8 @@
         mDialButton = findViewById(R.id.floating_action_button);
 
         // Check whether we should show the onscreen "Dial" button and co.
-        Resources res = getResources();
-        if (res.getBoolean(R.bool.config_show_onscreen_dial_button)) {
+        Bundle carrierConfig = PhoneGlobals.getInstance().getCarrierConfig();
+        if (carrierConfig.getBoolean(CarrierConfigManager.BOOL_SHOW_ONSCREEN_DIAL_BUTTON)) {
             mDialButton.setOnClickListener(this);
         } else {
             mDialButton.setVisibility(View.GONE);
@@ -238,7 +239,7 @@
         registerReceiver(mBroadcastReceiver, intentFilter);
 
         try {
-            mHaptic.init(this, res.getBoolean(R.bool.config_enable_dialer_key_vibration));
+            mHaptic.init(this, carrierConfig.getBoolean(CarrierConfigManager.BOOL_ENABLE_DIALER_KEY_VIBRATION));
         } catch (Resources.NotFoundException nfe) {
              Log.e(LOG_TAG, "Vibrate control bool missing.", nfe);
         }