commit 0b8d225f229b695dbf025228d14ac5a0d8da5371
author Yorke Lee <yorkelee@google.com> Wed Jun 10 16:31:20 2015 -0700
committer Yorke Lee <yorkelee@google.com> Fri Jun 12 10:17:18 2015 -0700
tree e37fe3d04e8d7f4e9a02432f0ba60822c04b64d6
parent 5086066954e8f237679f76ca952f7b403a734fd9

Move Wifi-calling setting to Call settings

Bug: 21499146
Change-Id: I2b4108ce1192b01aaee97b1a0f04064c43dd0a42

src/com/android/phone/CallFeaturesSetting.java

diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index d3d9dcf..60a6afe 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -25,6 +25,8 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 import android.os.Bundle;
 import android.os.PersistableBundle;
 import android.os.UserHandle;
@@ -101,6 +103,7 @@
 
     private Phone mPhone;
     private SubscriptionInfoHelper mSubscriptionInfoHelper;
+    private TelecomManager mTelecomManager;
 
     private CheckBoxPreference mButtonAutoRetry;
     private PreferenceScreen mVoicemailSettingsScreen;
@@ -179,6 +182,7 @@
         mSubscriptionInfoHelper.setActionBarTitle(
                 getActionBar(), getResources(), R.string.call_settings_with_label);
         mPhone = mSubscriptionInfoHelper.getPhone();
+        mTelecomManager = TelecomManager.from(this);
     }
 
     @Override
@@ -192,12 +196,11 @@
 
         addPreferencesFromResource(R.xml.call_feature_setting);
 
-        TelecomManager telecomManager = TelecomManager.from(this);
         TelephonyManager telephonyManager =
                 (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
 
         Preference phoneAccountSettingsPreference = findPreference(PHONE_ACCOUNT_SETTINGS_KEY);
-        if (telephonyManager.isMultiSimEnabled() || (telecomManager.getSimCallManagers().isEmpty()
+        if (telephonyManager.isMultiSimEnabled() || (mTelecomManager.getSimCallManagers().isEmpty()
                     && !SipUtil.isVoipSupported(mPhone.getContext()))) {
             getPreferenceScreen().removePreference(phoneAccountSettingsPreference);
         }
@@ -280,7 +283,29 @@
 
         Preference wifiCallingSettings = findPreference(
                 getResources().getString(R.string.wifi_calling_settings_key));
-        if (!ImsManager.isWfcEnabledByPlatform(mPhone.getContext())) {
+
+        final PhoneAccountHandle simCallManager = mTelecomManager.getSimCallManager();
+        String simCallManagerPackage = simCallManager != null
+                && simCallManager.getComponentName() != null
+                        ? simCallManager.getComponentName().getPackageName()
+                        : null;
+
+        if (!TextUtils.isEmpty(simCallManagerPackage)) {
+            final Intent intent = new Intent(TelecomManager.ACTION_CONNECTION_SERVICE_CONFIGURE)
+                    .addCategory(Intent.CATEGORY_DEFAULT)
+                    .setPackage(simCallManagerPackage);
+
+            // Check whether the configuration intent is supported.
+            PackageManager pm = getPackageManager();
+            List<ResolveInfo> resolutions = pm.queryIntentActivities(intent, 0);
+            if (resolutions.size() > 0) {
+                wifiCallingSettings.setTitle(R.string.wifi_calling);
+                wifiCallingSettings.setSummary(null);
+                wifiCallingSettings.setIntent(intent);
+            } else {
+                prefSet.removePreference(wifiCallingSettings);
+            }
+        } else if (!ImsManager.isWfcEnabledByPlatform(mPhone.getContext())) {
             prefSet.removePreference(wifiCallingSettings);
         } else {
             int resId = com.android.internal.R.string.wifi_calling_off_summary;