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

Commit 5bc67523 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Silent does not put phone into DND by default"

parents db4c5bc8 863e2775

media/java/android/media/VolumePolicy.java

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import java.util.Objects; 


/** @hide */

public final class VolumePolicy implements Parcelable {

    public static final VolumePolicy DEFAULT = new VolumePolicy(false, false, true, 400);

    public static final VolumePolicy DEFAULT = new VolumePolicy(false, false, false, 400);



    /**

     * Accessibility volume policy where the STREAM_MUSIC volume (i.e. media volume) affects

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogComponent.java

+3 −4
Original line number Diff line number Diff line
@@ -27,16 +27,15 @@ import android.os.Handler; 
import android.view.WindowManager.LayoutParams;



import com.android.settingslib.applications.InterestingConfigChanges;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.Dependency;

import com.android.systemui.SystemUI;

import com.android.systemui.keyguard.KeyguardViewMediator;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.plugins.PluginDependencyProvider;

import com.android.systemui.plugins.VolumeDialog;

import com.android.systemui.plugins.VolumeDialogController;

import com.android.systemui.qs.tiles.DndTile;

import com.android.systemui.statusbar.policy.ExtensionController;

import com.android.systemui.statusbar.policy.ExtensionController.Extension;

import com.android.systemui.tuner.TunerService;



import java.io.FileDescriptor;
@@ -53,8 +52,8 @@ public class VolumeDialogComponent implements VolumeComponent, TunerService.Tuna 
    public static final String VOLUME_SILENT_DO_NOT_DISTURB = "sysui_do_not_disturb";



    public static final boolean DEFAULT_VOLUME_DOWN_TO_ENTER_SILENT = false;

    public static final boolean DEFAULT_VOLUME_UP_TO_EXIT_SILENT = true;

    public static final boolean DEFAULT_DO_NOT_DISTURB_WHEN_SILENT = true;

    public static final boolean DEFAULT_VOLUME_UP_TO_EXIT_SILENT = false;

    public static final boolean DEFAULT_DO_NOT_DISTURB_WHEN_SILENT = false;



    private final SystemUI mSysui;

    private final Context mContext;