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

am c3a6cd6e: Merge "Move a line into try block"

Browse Source 
* commit 'c3a6cd6ee531c81f776551caa40b63732115e971':
  Move a line into try block
This commit is contained in:
Elliott Hughes
2013-11-05 10:30:01 -08:00
committed by Android Git Automerger
parent aeb1fa779b c3a6cd6ee5
commit 98f5e1861d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,7 +71,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
private CheckBoxPreference mNotificationPulse;
private final Configuration mCurConfig = new Configuration();
private ListPreference mScreenTimeoutPreference;
private Preference mScreenSaverPreference;
@@ -107,7 +107,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
com.android.internal.R.bool.config_dreamsSupported) == false) {
getPreferenceScreen().removePreference(mScreenSaverPreference);
}
mScreenTimeoutPreference = (ListPreference) findPreference(KEY_SCREEN_TIMEOUT);
final long currentTimeout = Settings.System.getLong(resolver, SCREEN_OFF_TIMEOUT,
FALLBACK_SCREEN_TIMEOUT_VALUE);
@@ -219,7 +219,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
}
return indices.length-1;
}
public void readFontSizePreference(ListPreference pref) {
try {
mCurConfig.updateFrom(ActivityManagerNative.getDefault().getConfiguration());
@@ -237,7 +237,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
pref.setSummary(String.format(res.getString(R.string.summary_font_size),
fontSizeNames[index]));
}
@Override
public void onResume() {
super.onResume();
@@ -343,8 +343,8 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
public boolean onPreferenceChange(Preference preference, Object objValue) {
final String key = preference.getKey();
if (KEY_SCREEN_TIMEOUT.equals(key)) {
int value = Integer.parseInt((String) objValue);
try {
int value = Integer.parseInt((String) objValue);
Settings.System.putInt(getContentResolver(), SCREEN_OFF_TIMEOUT, value);
updateTimeoutPreferenceDescription(value);
} catch (NumberFormatException e) {