commit 9504c6b5c5c7072f72d8a9e6df59dbda8a6ccbe4
author Jonathan Basseri <misterikkit@google.com> Thu Jun 04 14:23:32 2015 -0700
committer Jonathan Basseri <misterikkit@google.com> Fri Jun 05 14:55:26 2015 -0700
tree f7b06d134d8d48acdc26c9dc8697dcf02049cef1
parent 4eb890ab835a6e910bab4e98063e46f06d82464b

Renaming carrier config variable keys.

API council advised us to use KEY_NAME_TYPE for our key constants.

Bug: 21571894
Change-Id: Ib5d5aff1c9070d9e5913a4099fcf55c67b800150

src/com/android/phone/EmergencyDialer.java

diff --git a/src/com/android/phone/EmergencyDialer.java b/src/com/android/phone/EmergencyDialer.java
index 2e444e0..71557c6 100644
--- a/src/com/android/phone/EmergencyDialer.java
+++ b/src/com/android/phone/EmergencyDialer.java
@@ -201,7 +201,7 @@
 
         // Check whether we should show the onscreen "Dial" button and co.
         PersistableBundle carrierConfig = PhoneGlobals.getInstance().getCarrierConfig();
-        if (carrierConfig.getBoolean(CarrierConfigManager.BOOL_SHOW_ONSCREEN_DIAL_BUTTON)) {
+        if (carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_ONSCREEN_DIAL_BUTTON_BOOL)) {
             mDialButton.setOnClickListener(this);
         } else {
             mDialButton.setVisibility(View.GONE);
@@ -239,7 +239,10 @@
         registerReceiver(mBroadcastReceiver, intentFilter);
 
         try {
-            mHaptic.init(this, carrierConfig.getBoolean(CarrierConfigManager.BOOL_ENABLE_DIALER_KEY_VIBRATION));
+            mHaptic.init(
+                    this,
+                    carrierConfig.getBoolean(
+                            CarrierConfigManager.KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL));
         } catch (Resources.NotFoundException nfe) {
              Log.e(LOG_TAG, "Vibrate control bool missing.", nfe);
         }