Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2918f487 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Notification Power Widget: Fix silent mode detection" into ics

parents b23db63d 75f8b876

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

+7 −0
Original line number Diff line number Diff line
@@ -233,6 +233,13 @@ public class SoundButton extends PowerButton { 
            }



            Ringer r = (Ringer) o;

            // Silent mode docs: "Ringer mode that will be silent and will not

            // vibrate. (This overrides the vibrate setting.)" If silent mode is

            // set, don't bother checking vibrate since silent overrides. This

            // fixes cases where silent mode is not detected because of "wrong"

            // vibrate state.

            if (mRingerMode == AudioManager.RINGER_MODE_SILENT && (r.mRingerMode == mRingerMode))

                return true;

            return r.mVibrateInSilent == mVibrateInSilent && r.mVibrateSetting == mVibrateSetting

                    && r.mRingerMode == mRingerMode;

        }