diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-02-25 14:35:20 -0800 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2011-03-01 12:03:24 -0800 |
| commit | c06d4c48a9455d6018f2d793c6b8f211f1131055 (patch) | |
| tree | eddd752aef365ce631cca9910ebc89f7589b1fe2 /src/com/android/settings/DateTimeSettings.java | |
| parent | 489c7bff5c54c35e7156a99337d538e08f3aab7f (diff) | |
| download | packages_apps_Settings-c06d4c48a9455d6018f2d793c6b8f211f1131055.zip packages_apps_Settings-c06d4c48a9455d6018f2d793c6b8f211f1131055.tar.gz packages_apps_Settings-c06d4c48a9455d6018f2d793c6b8f211f1131055.tar.bz2 | |
Remove more entries not relevant to wifi-only devices.
Bug: 3488384
Bug: 3487976
Bug: 3488381
Removed Cell standby entry from Battery use screen.
Removed Mobile signal strength from BatteryHistory screen.
Added wifi IP address to About->Status
Remove auto-timezone checkbox in Settings->Date & time
Change-Id: I228721a3613b1aeb600026e42274337886552698
Diffstat (limited to 'src/com/android/settings/DateTimeSettings.java')
| -rw-r--r-- | src/com/android/settings/DateTimeSettings.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java index f1edbb9..64f42a0 100644 --- a/src/com/android/settings/DateTimeSettings.java +++ b/src/com/android/settings/DateTimeSettings.java @@ -87,6 +87,12 @@ public class DateTimeSettings extends SettingsPreferenceFragment mAutoTimePref = (CheckBoxPreference) findPreference(KEY_AUTO_TIME); mAutoTimePref.setChecked(autoTimeEnabled); mAutoTimeZonePref = (CheckBoxPreference) findPreference(KEY_AUTO_TIME_ZONE); + // Override auto-timezone if it's a wifi-only device. + // TODO: Remove this when auto-timezone is implemented based on wifi-location. + if (Utils.isWifiOnly()) { + getPreferenceScreen().removePreference(mAutoTimeZonePref); + autoTimeZoneEnabled = false; + } mAutoTimeZonePref.setChecked(autoTimeZoneEnabled); mTimePref = findPreference("time"); @@ -125,7 +131,6 @@ public class DateTimeSettings extends SettingsPreferenceFragment mTimeZone.setEnabled(!autoTimeZoneEnabled); } - @Override public void onResume() { super.onResume(); |