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

Commit 51f50b5b authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Add selection of silent mode to lockscreen." into gingerbread

parents 5e009639 dc953604

policy/src/com/android/internal/policy/impl/LockScreen.java

+11 −5
Original line number Diff line number Diff line
@@ -507,10 +507,16 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM 
        if (whichHandle == SlidingTab.OnTriggerListener.LEFT_HANDLE) {

            mCallback.goToUnlockScreen();

        } else if (whichHandle == SlidingTab.OnTriggerListener.RIGHT_HANDLE) {

            // toggle silent mode

            mSilentMode = !mSilentMode;

            // tri state silent<->vibrate<->ring if silent mode is enabled, otherwise toggle silent mode

            final boolean mVolumeControlSilent = Settings.System.getInt(mContext.getContentResolver(),

                Settings.System.VOLUME_CONTROL_SILENT, 0) != 0;

            mSilentMode = mVolumeControlSilent

                ? ((mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_VIBRATE) || !mSilentMode)

                : !mSilentMode;

            if (mSilentMode) {

                final boolean vibe = (Settings.System.getInt(

                final boolean vibe = mVolumeControlSilent

                ? (mAudioManager.getRingerMode() != AudioManager.RINGER_MODE_VIBRATE)

                : (Settings.System.getInt(

                    getContext().getContentResolver(),

                    Settings.System.VIBRATE_IN_SILENT, 1) == 1);