From 8d0e8ab838582f136e94b05a5e33e7b767b1fc0c Mon Sep 17 00:00:00 2001
From: Jason Parekh <>
Date: Tue, 24 Mar 2009 17:50:29 -0700
Subject: [PATCH] Automated import from //branches/master/...@140509,140509
---
res/values/strings.xml | 4 +++-
src/com/android/settings/SoundAndDisplaySettings.java | 7 +++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 55a153b3ec..67c095d6d3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -751,8 +751,10 @@
Set ringtones, notifications, screen brightness
Silent mode
-
+
All sounds except media & alarms are silenced
+
+ All sounds except media are silenced
Phone ringtone
diff --git a/src/com/android/settings/SoundAndDisplaySettings.java b/src/com/android/settings/SoundAndDisplaySettings.java
index 8905b859fd..e8cb10f98d 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();
--
2.11.0