PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am fc5a0222: Fix 2582241: Update selection based on user setting instead.

Browse Source 
Merge commit 'fc5a02225e8bca21f07543f55e1b51a33670c501' into kraken

* commit 'fc5a02225e8bca21f07543f55e1b51a33670c501':
  Fix 2582241: Update selection based on user setting instead.
This commit is contained in:
Jim Miller
2010-04-13 16:25:58 -07:00
committed by Android Git Automerger
parent ec3f64cbcb fc5a02225e
commit 838234f46b
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/DisplaySettings.java
View File

@@ -74,9 +74,9 @@ public class DisplaySettings extends PreferenceActivity implements
} }
private void disableUnusableTimeouts(ListPreference screenTimeoutPreference) { private void disableUnusableTimeouts(ListPreference screenTimeoutPreference) {
DevicePolicyManager dpm = final DevicePolicyManager dpm =
(DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE); (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
long maxTimeout = dpm != null ? dpm.getMaximumTimeToLock(null) : 0; final long maxTimeout = dpm != null ? dpm.getMaximumTimeToLock(null) : 0;
if (maxTimeout == 0) { if (maxTimeout == 0) {
return; // policy not enforced return; // policy not enforced
} }
@@ -96,7 +96,14 @@ public class DisplaySettings extends PreferenceActivity implements
revisedEntries.toArray(new CharSequence[revisedEntries.size()])); revisedEntries.toArray(new CharSequence[revisedEntries.size()]));
screenTimeoutPreference.setEntryValues( screenTimeoutPreference.setEntryValues(
revisedValues.toArray(new CharSequence[revisedValues.size()])); revisedValues.toArray(new CharSequence[revisedValues.size()]));
screenTimeoutPreference.setValue(String.valueOf(maxTimeout)); final int userPreference = Integer.valueOf(screenTimeoutPreference.getValue());
if (userPreference <= maxTimeout) {
screenTimeoutPreference.setValue(String.valueOf(userPreference));
} else {
// There will be no highlighted selection since nothing in the list matches
// maxTimeout. The user can still select anything less than maxTimeout.
// TODO: maybe append maxTimeout to the list and mark selected.
}
} }
screenTimeoutPreference.setEnabled(revisedEntries.size() > 0); screenTimeoutPreference.setEnabled(revisedEntries.size() > 0);
} }