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

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

Merge "Don't show vol settings button if in LockTask"

parents 61e9addb 34d271d0

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

+7 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.volume; 


import static android.accessibilityservice.AccessibilityServiceInfo.FEEDBACK_ALL_MASK;

import static android.accessibilityservice.AccessibilityServiceInfo.FEEDBACK_GENERIC;

import static android.app.ActivityManager.LOCK_TASK_MODE_NONE;

import static android.media.AudioManager.RINGER_MODE_NORMAL;

import static android.media.AudioManager.RINGER_MODE_SILENT;

import static android.media.AudioManager.RINGER_MODE_VIBRATE;
@@ -34,6 +35,7 @@ import static com.android.systemui.volume.Events.DISMISS_REASON_SETTINGS_CLICKED 
import android.accessibilityservice.AccessibilityServiceInfo;

import android.animation.ObjectAnimator;

import android.annotation.SuppressLint;

import android.app.ActivityManager;

import android.app.Dialog;

import android.app.KeyguardManager;

import android.content.ContentResolver;
@@ -129,6 +131,7 @@ public class VolumeDialogImpl implements VolumeDialog { 
    private ConfigurableTexts mConfigurableTexts;

    private final SparseBooleanArray mDynamic = new SparseBooleanArray();

    private final KeyguardManager mKeyguard;

    private final ActivityManager mActivityManager;

    private final AccessibilityManagerWrapper mAccessibilityMgr;

    private final Object mSafetyWarningLock = new Object();

    private final Accessibility mAccessibility = new Accessibility();
@@ -154,6 +157,7 @@ public class VolumeDialogImpl implements VolumeDialog { 
        mContext = new ContextThemeWrapper(context, com.android.systemui.R.style.qs_theme);

        mController = Dependency.get(VolumeDialogController.class);

        mKeyguard = (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE);

        mActivityManager = (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE);

        mAccessibilityMgr = Dependency.get(AccessibilityManagerWrapper.class);

        mDeviceProvisionedController = Dependency.get(DeviceProvisionedController.class);

        mShowActiveStreamOnly = showActiveStreamOnly();
@@ -431,7 +435,9 @@ public class VolumeDialogImpl implements VolumeDialog { 
    public void initSettingsH() {

        if (mSettingsView != null) {

            mSettingsView.setVisibility(

                    mDeviceProvisionedController.isCurrentUserSetup() ? VISIBLE : GONE);

                    mDeviceProvisionedController.isCurrentUserSetup() &&

                            mActivityManager.getLockTaskModeState() == LOCK_TASK_MODE_NONE ?

                            VISIBLE : GONE);

        }

        if (mSettingsIcon != null) {

            mSettingsIcon.setOnClickListener(v -> {