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

Commit 81427c0e authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "dismiss the volume shade if the a11y stream goes away" into oc-mr1-dev 

am: 9ffb8da7

Change-Id: I9be5eb42f0edb2f633c32b60f745eeeb139cb062
parents f64d77d5 9ffb8da7

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

+9 −7
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ public class Events { 
    public static final int DISMISS_REASON_SCREEN_OFF = 4;

    public static final int DISMISS_REASON_SETTINGS_CLICKED = 5;

    public static final int DISMISS_REASON_DONE_CLICKED = 6;

    public static final int DISMISS_STREAM_GONE = 7;

    public static final String[] DISMISS_REASONS = {

            "unknown",

            "touch_outside",
@@ -87,6 +88,7 @@ public class Events { 
            "screen_off",

            "settings_clicked",

            "done_clicked",

            "a11y_stream_changed"

    };



    public static final int SHOW_REASON_UNKNOWN = 0;

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

+6 −1
Original line number Diff line number Diff line
@@ -1059,7 +1059,12 @@ public class VolumeDialogImpl implements VolumeDialog, TunerService.Tunable { 
        public void onAccessibilityModeChanged(Boolean showA11yStream) {

            boolean show = showA11yStream == null ? false : showA11yStream;

            mShowA11yStream = show;

            updateRowsH(getActiveRow());

            VolumeRow activeRow = getActiveRow();

            if (!mShowA11yStream && AudioManager.STREAM_ACCESSIBILITY == activeRow.stream) {

                dismissH(Events.DISMISS_STREAM_GONE);

            } else {

                updateRowsH(activeRow);

            }



        }

    };