Dialer: Move IP prefix call setting config to system property

Change-Id: Ie184c9ef0019e345848ba33cce45b88a485444ae

3 files changed, 9 insertions, 2 deletions

diff --git a/src/com/android/dialer/DialerApplication.java b/src/com/android/dialer/DialerApplication.java
index 41e6717f2..39e72c569 100644
--- a/src/com/android/dialer/DialerApplication.java
+++ b/src/com/android/dialer/DialerApplication.java
@@ -3,6 +3,7 @@
 package com.android.dialer;
 
 import android.app.Application;
+import android.os.SystemProperties;
 
 import com.android.contacts.common.ContactPhotoManager;
 import com.android.contacts.common.extensions.ExtensionsFactory;
@@ -29,4 +30,8 @@ public class DialerApplication extends Application {
 
         return super.getSystemService(name);
     }
+
+    public static boolean isIPCallEnabled() {
+        return SystemProperties.getBoolean("persist.radio.ipcall.enabled", false);
+    }
 }
diff --git a/src/com/android/dialer/calllog/CallLogFragment.java b/src/com/android/dialer/calllog/CallLogFragment.java
index ce024771b..00a25d6e7 100644
--- a/src/com/android/dialer/calllog/CallLogFragment.java
+++ b/src/com/android/dialer/calllog/CallLogFragment.java
@@ -51,6 +51,7 @@ import com.android.common.io.MoreCloseables;
 import com.android.contacts.common.CallUtil;
 import com.android.contacts.common.GeoUtil;
 import com.android.contacts.common.MoreContactUtils;
+import com.android.dialer.DialerApplication;
 import com.android.dialer.R;
 import com.android.dialer.util.EmptyLoader;
 import com.android.dialer.voicemail.VoicemailStatusHelper;
@@ -289,7 +290,7 @@ public class CallLogFragment extends ListFragment
         final MenuItem sendTextMessageMenuItem = menu.findItem(R.id.menu_send_text_message);
         final MenuItem addToContactMenuItem = menu.findItem(R.id.menu_add_to_contacts);
         final boolean isIPPrefixEnabled =
-                getResources().getBoolean(R.bool.config_ip_prefix_enable);
+                DialerApplication.isIPCallEnabled();
         AdapterView.AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
         mNumber = getValidCallLogNumber(info.position);
 
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index aeb7012f7..da6e7cf4b 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -79,6 +79,7 @@ import com.android.contacts.common.GeoUtil;
 import com.android.contacts.common.MoreContactUtils;
 import com.android.contacts.common.util.PhoneNumberFormatter;
 import com.android.contacts.common.util.StopWatch;
+import com.android.dialer.DialerApplication;
 import com.android.dialer.NeededForReflection;
 import com.android.dialer.DialtactsActivity;
 import com.android.dialer.R;
@@ -847,7 +848,7 @@ public class DialpadFragment extends Fragment
         final MenuItem ipCallBySlot1MenuItem = menu.findItem(R.id.menu_ip_call_by_slot1);
         final MenuItem ipCallBySlot2MenuItem = menu.findItem(R.id.menu_ip_call_by_slot2);
         final boolean isIPPrefixEnabled =
-                getResources().getBoolean(R.bool.config_ip_prefix_enable);
+                DialerApplication.isIPCallEnabled();
         // We show "video call setting" menu only when the csvt is supported
         //which means the prop "persist.radio.csvt.enabled" = true
         videocallsettingsMenuItem.setVisible(isVTSupported());