commit a134adb9c915ac10f912339e5477dee42e183771
author Abhishek Gupta <abgupta@google.com> Thu Apr 14 18:57:31 2016 -0700
committer Abhishek Gupta <abgupta@google.com> Thu Apr 14 19:45:34 2016 -0700
tree b7e29d3af2673d1de11d1b618c25b28b8faa400c
parent e0214d459e229ed490b9996beaff89527bb04986

Use Activity label for setting the title for wifi-calling preference so that control resides within the Activity.
Bug: 27707719

Change-Id: I74fa451cffa8a8c7ef397cada2a4d9f6f78bb0ab

src/com/android/phone/CallFeaturesSetting.java

diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index 2f835fe..d74558f 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -288,9 +288,15 @@
             Intent intent = PhoneAccountSettingsFragment.buildPhoneAccountConfigureIntent(
                     this, simCallManager);
             if (intent != null) {
-                wifiCallingSettings.setTitle(R.string.wifi_calling);
-                wifiCallingSettings.setSummary(null);
-                wifiCallingSettings.setIntent(intent);
+                PackageManager pm = mPhone.getContext().getPackageManager();
+                List<ResolveInfo> resolutions = pm.queryIntentActivities(intent, 0);
+                if (!resolutions.isEmpty()) {
+                    wifiCallingSettings.setTitle(resolutions.get(0).loadLabel(pm));
+                    wifiCallingSettings.setSummary(null);
+                    wifiCallingSettings.setIntent(intent);
+                } else {
+                    prefSet.removePreference(wifiCallingSettings);
+                }
             } else {
                 prefSet.removePreference(wifiCallingSettings);
             }