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

Merge commit '5c20034b' into fix

Browse Source 
Conflicts:

	res/values/strings.xml
This commit is contained in:
Mitsuru Oshima
2009-07-20 23:30:04 -07:00
parent 3a76bcaa83 5c20034b7f
commit 7f44ca3170
3 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,7 +55,6 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
private static final String KEY_ANIMATIONS = "animations";
private static final String KEY_ACCELEROMETER = "accelerometer";
private static final String KEY_PLAY_MEDIA_NOTIFICATION_SOUNDS = "play_media_notification_sounds";
private static final String KEY_COMPATIBILITY_MODE = "compatibility_mode";
private static final String KEY_EMERGENCY_TONE ="emergency_tone";
private CheckBoxPreference mSilent;
@@ -76,7 +75,6 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
private CheckBoxPreference mSoundEffects;
private CheckBoxPreference mAnimations;
private CheckBoxPreference mAccelerometer;
private CheckBoxPreference mCompatibilityMode;
private float[] mAnimationScales;
private AudioManager mAudioManager;
@@ -124,10 +122,6 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
mAnimations.setPersistent(false);
mAccelerometer = (CheckBoxPreference) findPreference(KEY_ACCELEROMETER);
mAccelerometer.setPersistent(false);
mCompatibilityMode = (CheckBoxPreference) findPreference(KEY_COMPATIBILITY_MODE);
mCompatibilityMode.setPersistent(false);
mCompatibilityMode.setChecked(Settings.System.getInt(resolver,
Settings.System.COMPATIBILITY_MODE, 1) != 0);
ListPreference screenTimeoutPreference =
(ListPreference) findPreference(KEY_SCREEN_TIMEOUT);
@@ -269,10 +263,6 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
Settings.System.putInt(getContentResolver(),
Settings.System.ACCELEROMETER_ROTATION,
mAccelerometer.isChecked() ? 1 : 0);
} else if (preference == mCompatibilityMode) {
Settings.System.putInt(getContentResolver(),
Settings.System.COMPATIBILITY_MODE,
mCompatibilityMode.isChecked() ? 1 : 0);
}
return true;
}