Merge "Notification PowerWidget: Additional SoundMode: Vibrate/Silent" into gingerbread (151b2999) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/SoundButton.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ public class SoundButton extends PowerButton {
		public static final int CM_MODE_SOUNDVIB_VIB_SILENT = 3;
		public static final int CM_MODE_SOUND_VIB_SILENT = 4;
		public static final int CM_MODE_SOUNDVIB_SOUND_VIB_SILENT = 5;
		public static final int CM_MODE_VIB_SILENT = 6;

		public static final int VIBRATE_DURATION = 500; // 0.5s

		@@ -159,14 +160,16 @@ public class SoundButton extends PowerButton {
		case RINGER_MODE_SILENT:
		if (currentMode == CM_MODE_SOUND_SILENT \|\| currentMode == CM_MODE_SOUNDVIB_VIB_SILENT
		\|\| currentMode == CM_MODE_SOUND_VIB_SILENT
		\|\| currentMode == CM_MODE_SOUNDVIB_SOUND_VIB_SILENT)
		\|\| currentMode == CM_MODE_SOUNDVIB_SOUND_VIB_SILENT
		\|\| currentMode == CM_MODE_VIB_SILENT)
		return true;
		break;
		case RINGER_MODE_VIBRATE_ONLY:
		if (currentMode == CM_MODE_SOUND_VIB \|\| currentMode == CM_MODE_SOUNDVIB_VIB
		\|\| currentMode == CM_MODE_SOUNDVIB_VIB_SILENT
		\|\| currentMode == CM_MODE_SOUND_VIB_SILENT
		\|\| currentMode == CM_MODE_SOUNDVIB_SOUND_VIB_SILENT)
		\|\| currentMode == CM_MODE_SOUNDVIB_SOUND_VIB_SILENT
		\|\| currentMode == CM_MODE_VIB_SILENT)
		return true;
		break;
		case RINGER_MODE_SOUND_ONLY: