Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I32389dffa83a3cca273db440f29e39854166f76f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Julia Reynolds
2022-09-19 15:58:00 +00:00
committed by Automerger Merge Worker
parent 436f46078c 762f54da6a
commit f0db85f175
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
View File

@@ -48,6 +48,7 @@ import android.app.KeyguardManager;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.res.ColorStateList; import android.content.res.ColorStateList;
import android.content.res.Configuration; import android.content.res.Configuration;
@@ -74,6 +75,7 @@ import android.os.VibrationEffect;
import android.provider.Settings; import android.provider.Settings;
import android.provider.Settings.Global; import android.provider.Settings.Global;
import android.text.InputFilter; import android.text.InputFilter;
import android.util.FeatureFlagUtils;
import android.util.Log; import android.util.Log;
import android.util.Slog; import android.util.Slog;
import android.util.SparseBooleanArray; import android.util.SparseBooleanArray;
@@ -1049,7 +1051,13 @@ public class VolumeDialogImpl implements VolumeDialog,
Events.writeEvent(Events.EVENT_SETTINGS_CLICK); Events.writeEvent(Events.EVENT_SETTINGS_CLICK);
dismissH(DISMISS_REASON_SETTINGS_CLICKED); dismissH(DISMISS_REASON_SETTINGS_CLICKED);
mMediaOutputDialogFactory.dismiss(); mMediaOutputDialogFactory.dismiss();
mVolumePanelFactory.create(true /* aboveStatusBar */, null); 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 */);
}
}); });
} }
} }