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

Commit e62ee606 authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge "Refer to FeatureFlagUtils.SETTINGS_VOLUME_PANEL_IN_SYSTEMUI to launch... 

Merge "Refer to FeatureFlagUtils.SETTINGS_VOLUME_PANEL_IN_SYSTEMUI to launch the VolumePanel in SystemUI or in Settings" into tm-qpr-dev am: 762f54da am: f0db85f1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19988664



Change-Id: I370161f6eb1353253cbcf30298e5fc3b88e1d4c9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8910ab95 f0db85f1

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

+9 −1
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import android.app.KeyguardManager; 
import android.content.ContentResolver;

import android.content.Context;

import android.content.DialogInterface;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.content.res.ColorStateList;

import android.content.res.Configuration;
@@ -74,6 +75,7 @@ import android.os.VibrationEffect; 
import android.provider.Settings;

import android.provider.Settings.Global;

import android.text.InputFilter;

import android.util.FeatureFlagUtils;

import android.util.Log;

import android.util.Slog;

import android.util.SparseBooleanArray;
@@ -1049,7 +1051,13 @@ public class VolumeDialogImpl implements VolumeDialog, 
                Events.writeEvent(Events.EVENT_SETTINGS_CLICK);

                dismissH(DISMISS_REASON_SETTINGS_CLICKED);

                mMediaOutputDialogFactory.dismiss();

                if (FeatureFlagUtils.isEnabled(mContext,

                        FeatureFlagUtils.SETTINGS_VOLUME_PANEL_IN_SYSTEMUI)) {

                    mVolumePanelFactory.create(true /* aboveStatusBar */, null);

                } else {

                    mActivityStarter.startActivity(new Intent(Settings.Panel.ACTION_VOLUME),

                            true /* dismissShade */);

                }

            });

        }

    }