diff options
| author | Danny Baumann <dannybaumann@web.de> | 2013-05-29 05:31:35 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-05-29 05:31:35 -0700 |
| commit | 5cb4debe16f4169827c5dcdbfeef5f80c06ad2c7 (patch) | |
| tree | 032f649fb941373ae0e266281ce1cb853246897c /src/com/android | |
| parent | ccf68318c7773e73befa67edaf51d7811b31d646 (diff) | |
| parent | 0a55f3a3652dde2399cfcd62a41a6b49fa324960 (diff) | |
| download | packages_apps_Settings-5cb4debe16f4169827c5dcdbfeef5f80c06ad2c7.zip packages_apps_Settings-5cb4debe16f4169827c5dcdbfeef5f80c06ad2c7.tar.gz packages_apps_Settings-5cb4debe16f4169827c5dcdbfeef5f80c06ad2c7.tar.bz2 | |
Merge "ProfilesSettings : Allow nfc override (2/2)" into cm-10.1
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/settings/profiles/ProfileConfig.java | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/com/android/settings/profiles/ProfileConfig.java b/src/com/android/settings/profiles/ProfileConfig.java index 4e6967b..fc47ff0 100644 --- a/src/com/android/settings/profiles/ProfileConfig.java +++ b/src/com/android/settings/profiles/ProfileConfig.java @@ -16,6 +16,8 @@ package com.android.settings.profiles; +import static com.android.internal.util.cm.QSUtils.*; + import java.util.ArrayList; import java.util.UUID; @@ -91,15 +93,22 @@ public class ProfileConfig extends SettingsPreferenceFragment }; mConnections = new ArrayList<ConnectionItem>(); - mConnections.add(new ConnectionItem(ConnectionSettings.PROFILE_CONNECTION_MOBILEDATA, getString(R.string.toggleData))); - mConnections.add(new ConnectionItem(ConnectionSettings.PROFILE_CONNECTION_BLUETOOTH, getString(R.string.toggleBluetooth))); + if (deviceSupportsBluetooth()) { + mConnections.add(new ConnectionItem(ConnectionSettings.PROFILE_CONNECTION_BLUETOOTH, getString(R.string.toggleBluetooth))); + } mConnections.add(new ConnectionItem(ConnectionSettings.PROFILE_CONNECTION_GPS, getString(R.string.toggleGPS))); mConnections.add(new ConnectionItem(ConnectionSettings.PROFILE_CONNECTION_WIFI, getString(R.string.toggleWifi))); mConnections.add(new ConnectionItem(ConnectionSettings.PROFILE_CONNECTION_SYNC, getString(R.string.toggleSync))); - mConnections.add(new ConnectionItem(ConnectionSettings.PROFILE_CONNECTION_WIFIAP, getString(R.string.toggleWifiAp))); + if (deviceSupportsMobileData(getActivity())) { + mConnections.add(new ConnectionItem(ConnectionSettings.PROFILE_CONNECTION_MOBILEDATA, getString(R.string.toggleData))); + mConnections.add(new ConnectionItem(ConnectionSettings.PROFILE_CONNECTION_WIFIAP, getString(R.string.toggleWifiAp))); + } if (WimaxHelper.isWimaxSupported(getActivity())) { mConnections.add(new ConnectionItem(ConnectionSettings.PROFILE_CONNECTION_WIMAX, getString(R.string.toggleWimax))); } + if (deviceSupportsNfc(getActivity())) { + mConnections.add(new ConnectionItem(ConnectionSettings.PROFILE_CONNECTION_NFC, getString(R.string.toggleNfc))); + } addPreferencesFromResource(R.xml.profile_config); |