diff options
| author | Chung-yih Wang <cywang@google.com> | 2010-09-10 19:52:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-10 19:52:31 -0700 |
| commit | 2af8a0076ed7eb8e75cc6e3def117835214b2773 (patch) | |
| tree | fe1f322b17a903a11d193fa5613f52367ee6bb8e /src | |
| parent | 8ce1853fffd8950f7f3588af28d5e064c20cd29f (diff) | |
| parent | e5e4282af1d2d4277c8e2c13a312be0187f44257 (diff) | |
| download | packages_apps_settings-2af8a0076ed7eb8e75cc6e3def117835214b2773.zip packages_apps_settings-2af8a0076ed7eb8e75cc6e3def117835214b2773.tar.gz packages_apps_settings-2af8a0076ed7eb8e75cc6e3def117835214b2773.tar.bz2 | |
am e5e4282a: Enable the call setting when the VoIP feature is supported.
Merge commit 'e5e4282af1d2d4277c8e2c13a312be0187f44257' into gingerbread-plus-aosp
* commit 'e5e4282af1d2d4277c8e2c13a312be0187f44257':
Enable the call setting when the VoIP feature is supported.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/Settings.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index a2816f8..4ecf85b 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -16,6 +16,7 @@ package com.android.settings; +import android.net.sip.SipManager; import android.os.Bundle; import android.preference.Preference; import android.preference.PreferenceActivity; @@ -56,7 +57,9 @@ public class Settings extends PreferenceActivity { @Override protected void onResume() { super.onResume(); - findPreference(KEY_CALL_SETTINGS).setEnabled(!AirplaneModeEnabler.isAirplaneModeOn(this)); + findPreference(KEY_CALL_SETTINGS).setEnabled( + !AirplaneModeEnabler.isAirplaneModeOn(this) + || SipManager.isVoipSupported(this)); } } |