diff options
author | cretin45 <cretin45@gmail.com> | 2014-11-07 15:03:08 -0800 |
---|---|---|
committer | cretin45 <cretin45@gmail.com> | 2014-11-07 15:03:08 -0800 |
commit | 47f8ed9196a16dcb78a390fa455cc17ea635e49c (patch) | |
tree | 3bfd53563ed12d594d36449fe443429ccd3f3b24 | |
parent | efb69854685dda5c5891c56162938a435b550b18 (diff) | |
download | android_packages_apps_Dialer-47f8ed9196a16dcb78a390fa455cc17ea635e49c.tar.gz android_packages_apps_Dialer-47f8ed9196a16dcb78a390fa455cc17ea635e49c.tar.bz2 android_packages_apps_Dialer-47f8ed9196a16dcb78a390fa455cc17ea635e49c.zip |
Dialer: Move IP prefix call setting config to system property
Change-Id: Ie184c9ef0019e345848ba33cce45b88a485444ae
-rw-r--r-- | res/values/config.xml | 3 | ||||
-rw-r--r-- | src/com/android/dialer/DialerApplication.java | 5 | ||||
-rw-r--r-- | src/com/android/dialer/calllog/CallLogFragment.java | 3 | ||||
-rw-r--r-- | src/com/android/dialer/dialpad/DialpadFragment.java | 3 |
4 files changed, 9 insertions, 5 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index 994f0a016..87a074bd4 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -19,7 +19,4 @@ <integer name="call_recording_audio_source">1</integer> <integer name="call_recording_audio_encoder">0</integer> <bool name="call_durationtype_enabled">false</bool> - - <!-- Flag whether to enable IP Prefix setting--> - <bool name="config_ip_prefix_enable" translatable="false">false</bool> </resources> 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()); |