Automated import from //branches/donutburger/...@140507,140507

This commit is contained in:
Jason Parekh
2009-03-24 17:48:28 -07:00
committed by The Android Open Source Project
parent e6dd1fa185
commit 2c9b326fdb
2 changed files with 10 additions and 1 deletions

View File

@@ -162,6 +162,13 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
mVibrate.setChecked(vibrateSetting);
}
int silentModeStreams = Settings.System.getInt(getContentResolver(),
Settings.System.MODE_RINGER_STREAMS_AFFECTED, 0);
boolean isAlarmInclSilentMode = (silentModeStreams & (1 << AudioManager.STREAM_ALARM)) != 0;
mSilent.setSummary(isAlarmInclSilentMode ?
R.string.silent_mode_incl_alarm_summary :
R.string.silent_mode_summary);
boolean animations = true;
try {
mAnimationScales = mWindowManager.getAnimationScales();