diff options
| author | Vinit Deshpande <vinitd@google.com> | 2015-03-16 00:55:25 -0700 |
|---|---|---|
| committer | Vinit Deshpande <vinitd@google.com> | 2015-03-16 00:55:25 -0700 |
| commit | 3b84208212727833ccebea3fef03901331f5a12d (patch) | |
| tree | 7e082b31b3140e3556a4ebeec0167ef3f847ac88 /src/com/android/settings/WirelessSettings.java | |
| parent | 66f1543690fbda646f413ff20256ba75ae6ac996 (diff) | |
| parent | 736d29b87c495881bb50d4e3682aa82f5fcd708f (diff) | |
| download | packages_apps_Settings-3b84208212727833ccebea3fef03901331f5a12d.zip packages_apps_Settings-3b84208212727833ccebea3fef03901331f5a12d.tar.gz packages_apps_Settings-3b84208212727833ccebea3fef03901331f5a12d.tar.bz2 | |
Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'
Change-Id: I6c9de433a224925961b484b400a89edf9059d2bd
Diffstat (limited to 'src/com/android/settings/WirelessSettings.java')
| -rw-r--r-- | src/com/android/settings/WirelessSettings.java | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java index 0bd6b29..71cd322 100644 --- a/src/com/android/settings/WirelessSettings.java +++ b/src/com/android/settings/WirelessSettings.java @@ -47,6 +47,8 @@ import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; +import com.android.ims.ImsConfig; +import com.android.ims.ImsManager; import com.android.internal.telephony.SmsApplication; import com.android.internal.telephony.SmsApplication.SmsApplicationData; import com.android.internal.telephony.TelephonyIntents; @@ -54,6 +56,7 @@ import com.android.internal.telephony.TelephonyProperties; import com.android.settings.nfc.NfcEnabler; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; +import com.android.settings.WifiCallingSettings; import java.util.ArrayList; import java.util.Arrays; @@ -76,6 +79,7 @@ public class WirelessSettings extends SettingsPreferenceFragment private static final String KEY_SMS_APPLICATION = "sms_application"; private static final String KEY_TOGGLE_NSD = "toggle_nsd"; //network service discovery private static final String KEY_CELL_BROADCAST_SETTINGS = "cell_broadcast_settings"; + private static final String KEY_WFC_SETTINGS = "wifi_calling_settings"; public static final String EXIT_ECM_RESULT = "exit_ecm_result"; public static final int REQUEST_CODE_EXIT_ECM = 1; @@ -95,6 +99,7 @@ public class WirelessSettings extends SettingsPreferenceFragment private static final String SAVED_MANAGE_MOBILE_PLAN_MSG = "mManageMobilePlanMessage"; private AppListPreference mSmsApplicationPreference; + private PreferenceScreen mButtonWfc; /** * Invoked on each preference click in this hierarchy, overrides @@ -272,6 +277,12 @@ public class WirelessSettings extends SettingsPreferenceFragment initSmsApplicationSetting(); } + if (ImsManager.isWfcEnabledByPlatform(activity)) { + mButtonWfc = (PreferenceScreen) findPreference(KEY_WFC_SETTINGS); + } else { + removePreference(KEY_WFC_SETTINGS); + } + // Remove NSD checkbox by default getPreferenceScreen().removePreference(nsd); //mNsdEnabler = new NsdEnabler(activity, nsd); @@ -413,6 +424,12 @@ public class WirelessSettings extends SettingsPreferenceFragment if (mNsdEnabler != null) { mNsdEnabler.resume(); } + + final Context context = getActivity(); + if (ImsManager.isWfcEnabledByPlatform(context)) { + mButtonWfc.setSummary(WifiCallingSettings.getWfcModeSummary( + context, ImsManager.getWfcMode(context))); + } } @Override |