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

Commit e0600442 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Fix a11y volume not always being shown" into oc-dr1-dev

parents a69c03b6 ae30597e

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

+8 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import android.provider.Settings; 
import android.service.notification.Condition;

import android.util.ArrayMap;

import android.util.Log;

import android.view.accessibility.AccessibilityManager;



import com.android.internal.annotations.GuardedBy;

import com.android.systemui.Dumpable;
@@ -122,6 +123,12 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa 
        mReceiver.init();

        mVibrator = (Vibrator) mContext.getSystemService(Context.VIBRATOR_SERVICE);

        mHasVibrator = mVibrator != null && mVibrator.hasVibrator();



        boolean accessibilityVolumeStreamActive = context.getSystemService(

                AccessibilityManager.class).isAccessibilityVolumeStreamActive();

        mVolumeController.setA11yMode(accessibilityVolumeStreamActive ?

                    VolumePolicy.A11Y_MODE_INDEPENDENT_A11Y_VOLUME :

                        VolumePolicy.A11Y_MODE_MEDIA_A11Y_VOLUME);

    }



    public AudioManager getAudioManager() {
@@ -210,6 +217,7 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa 


    public void addCallback(Callbacks callback, Handler handler) {

        mCallbacks.add(callback, handler);

        callback.onAccessibilityModeChanged(mShowA11yStream);

    }



    public void setUserActivityListener(UserActivityListener listener) {