summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/SoundAndDisplaySettings.java
diff options
context:
space:
mode:
authorJason Parekh <>2009-03-24 17:48:28 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-24 17:48:28 -0700
commit2c9b326fdbfe64dc778b5eabf80017249a509351 (patch)
treedcaf5e7205ae77f06eff124d5ebdcbc53529dad5 /src/com/android/settings/SoundAndDisplaySettings.java
parente6dd1fa1851302710ac7845d25d8ad8a5b6ee438 (diff)
downloadpackages_apps_Settings-2c9b326fdbfe64dc778b5eabf80017249a509351.tar.gz
packages_apps_Settings-2c9b326fdbfe64dc778b5eabf80017249a509351.tar.bz2
packages_apps_Settings-2c9b326fdbfe64dc778b5eabf80017249a509351.zip
Automated import from //branches/donutburger/...@140507,140507
Diffstat (limited to 'src/com/android/settings/SoundAndDisplaySettings.java')
-rw-r--r--src/com/android/settings/SoundAndDisplaySettings.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/settings/SoundAndDisplaySettings.java b/src/com/android/settings/SoundAndDisplaySettings.java
index 8905b859f..e8cb10f98 100644
--- a/src/com/android/settings/SoundAndDisplaySettings.java
+++ b/src/com/android/settings/SoundAndDisplaySettings.java
@@ -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();