diff options
Diffstat (limited to 'src/com/android/settings/profiles/ProfileConfig.java')
-rw-r--r-- | src/com/android/settings/profiles/ProfileConfig.java | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/com/android/settings/profiles/ProfileConfig.java b/src/com/android/settings/profiles/ProfileConfig.java index 1a7a53e..da9aedf 100644 --- a/src/com/android/settings/profiles/ProfileConfig.java +++ b/src/com/android/settings/profiles/ProfileConfig.java @@ -41,6 +41,7 @@ import android.preference.Preference; import android.preference.PreferenceActivity; import android.preference.PreferenceGroup; import android.preference.PreferenceScreen; +import android.telephony.TelephonyManager; import android.util.Log; import android.view.Menu; import android.view.MenuInflater; @@ -103,6 +104,10 @@ public class ProfileConfig extends SettingsPreferenceFragment 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))); + final TelephonyManager tm = (TelephonyManager) getActivity().getSystemService(Context.TELEPHONY_SERVICE); + if (tm.getPhoneType() == TelephonyManager.PHONE_TYPE_GSM) { + mConnections.add(new ConnectionItem(ConnectionSettings.PROFILE_CONNECTION_2G3G, getString(R.string.toggle2g3g), R.array.profile_networkmode_entries)); + } } if (WimaxHelper.isWimaxSupported(getActivity())) { mConnections.add(new ConnectionItem(ConnectionSettings.PROFILE_CONNECTION_WIMAX, getString(R.string.toggleWimax))); @@ -299,6 +304,7 @@ public class ProfileConfig extends SettingsPreferenceFragment if (connectionList != null) { connectionList.removeAll(); for (ConnectionItem connection : mConnections) { + String[] connectionstrings = getResources().getStringArray(connection.mChoices); ConnectionSettings settings = mProfile.getSettingsForConnection(connection.mConnectionId); if (settings == null) { settings = new ConnectionSettings(connection.mConnectionId); @@ -308,8 +314,7 @@ public class ProfileConfig extends SettingsPreferenceFragment ProfileConnectionPreference pref = new ProfileConnectionPreference(getActivity()); pref.setKey("connection_" + connection.mConnectionId); pref.setTitle(connection.mLabel); - pref.setSummary(settings.getValue() == 1 ? getString(R.string.connection_state_enabled) - : getString(R.string.connection_state_disabled)); + pref.setSummary(connectionstrings[settings.getValue()]); pref.setPersistent(false); pref.setConnectionItem(connection); connection.mCheckbox = pref; @@ -439,10 +444,18 @@ public class ProfileConfig extends SettingsPreferenceFragment String mLabel; ConnectionSettings mSettings; ProfileConnectionPreference mCheckbox; + int mChoices; public ConnectionItem(int connectionId, String label) { mConnectionId = connectionId; + mChoices = R.array.profile_connection_entries; + mLabel = label; + } + + public ConnectionItem(int connectionId, String label, int choices) { + mConnectionId = connectionId; mLabel = label; + mChoices = choices; } } |