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

Commit e1015681 authored by David van Tonder's avatar David van Tonder Committed by Gerrit Code Review
Browse files

Merge "QuietHours: disable volume change tone during quiet hours" into cm-11.0

parents d57ac569 90e92089

core/java/android/view/VolumePanel.java

+9 −5
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ import android.widget.ImageView; 
import android.widget.SeekBar;

import android.widget.SeekBar.OnSeekBarChangeListener;



import com.android.internal.util.cm.QuietHoursUtils;



import java.util.HashMap;



/**
@@ -855,6 +857,7 @@ public class VolumePanel extends Handler implements OnSeekBarChangeListener, Vie 
            onStopSounds();

        }



        if (!QuietHoursUtils.inQuietHours(mContext, Settings.System.QUIET_HOURS_SYSTEM)) {

            synchronized (this) {

                ToneGenerator toneGen = getOrCreateToneGenerator(streamType);

                if (toneGen != null) {
@@ -863,6 +866,7 @@ public class VolumePanel extends Handler implements OnSeekBarChangeListener, Vie 
                }

            }

        }

    }



    protected void onStopSounds() {