Merge "add MVNO field for APN Editor"
diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java
index b7bbc67..ab87527 100644
--- a/src/com/android/settings/DateTimeSettings.java
+++ b/src/com/android/settings/DateTimeSettings.java
@@ -244,6 +244,15 @@
calendar.get(Calendar.YEAR),
calendar.get(Calendar.MONTH),
calendar.get(Calendar.DAY_OF_MONTH));
+ // The system clock can't represent dates outside this range.
+ DatePickerDialog datePicker = (DatePickerDialog)d;
+ Calendar t = Calendar.getInstance();
+ t.clear();
+ t.set(1970, Calendar.JANUARY, 1);
+ datePicker.getDatePicker().setMinDate(t.getTimeInMillis());
+ t.clear();
+ t.set(2037, Calendar.DECEMBER, 31);
+ datePicker.getDatePicker().setMaxDate(t.getTimeInMillis());
break;
}
case DIALOG_TIMEPICKER: {
diff --git a/src/com/android/settings/SoundSettings.java b/src/com/android/settings/SoundSettings.java
index 7e46171..931858c 100644
--- a/src/com/android/settings/SoundSettings.java
+++ b/src/com/android/settings/SoundSettings.java
@@ -78,7 +78,7 @@
private static final String[] NEED_VOICE_CAPABILITY = {
KEY_RINGTONE, KEY_DTMF_TONE, KEY_CATEGORY_CALLS,
- KEY_EMERGENCY_TONE
+ KEY_EMERGENCY_TONE, KEY_VIBRATE
};
private static final int MSG_UPDATE_RINGTONE_SUMMARY = 1;
@@ -175,9 +175,6 @@
removePreference(KEY_VIBRATE);
removePreference(KEY_HAPTIC_FEEDBACK);
}
- if (!Utils.isVoiceCapable(getActivity())) {
- removePreference(KEY_VIBRATE);
- }
if (TelephonyManager.PHONE_TYPE_CDMA == activePhoneType) {
ListPreference emergencyTonePreference =
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index df44e91..d2c99dc 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -388,7 +388,7 @@
int btState = adapter.getState();
if (btState == BluetoothAdapter.STATE_TURNING_OFF) {
mBluetoothTether.setEnabled(false);
- mBluetoothTether.setSummary(R.string.wifi_stopping);
+ mBluetoothTether.setSummary(R.string.bluetooth_turning_off);
} else if (btState == BluetoothAdapter.STATE_TURNING_ON) {
mBluetoothTether.setEnabled(false);
mBluetoothTether.setSummary(R.string.bluetooth_turning_on);
diff --git a/src/com/android/settings/wifi/AccessPoint.java b/src/com/android/settings/wifi/AccessPoint.java
index f6581a5..20146eb 100644
--- a/src/com/android/settings/wifi/AccessPoint.java
+++ b/src/com/android/settings/wifi/AccessPoint.java
@@ -338,11 +338,7 @@
setTitle(ssid);
Context context = getContext();
- if (mState != null) { // This is the active connection
- setSummary(Summary.get(context, mState));
- } else if (mRssi == Integer.MAX_VALUE) { // Wifi out of range
- setSummary(context.getString(R.string.wifi_not_in_range));
- } else if (mConfig != null && mConfig.status == WifiConfiguration.Status.DISABLED) {
+ if (mConfig != null && mConfig.status == WifiConfiguration.Status.DISABLED) {
switch (mConfig.disableReason) {
case WifiConfiguration.DISABLED_AUTH_FAILURE:
setSummary(context.getString(R.string.wifi_disabled_password_failure));
@@ -354,6 +350,10 @@
case WifiConfiguration.DISABLED_UNKNOWN_REASON:
setSummary(context.getString(R.string.wifi_disabled_generic));
}
+ } else if (mRssi == Integer.MAX_VALUE) { // Wifi out of range
+ setSummary(context.getString(R.string.wifi_not_in_range));
+ } else if (mState != null) { // This is the active connection
+ setSummary(Summary.get(context, mState));
} else { // In range, not disabled.
StringBuilder summary = new StringBuilder();
if (mConfig != null) { // Is saved network
