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

Commit c597de91 authored by Anthony Tripaldi's avatar Anthony Tripaldi Committed by android-build-merger
Browse files

Merge "Remove dismiss action and associated event tag. Users expect the volume... 

Merge "Remove dismiss action and associated event tag. Users expect the volume dialog to stay on screen after a press, like when interacting with the rest of the dialog." into qt-dev
am: 4e75d8b4

Change-Id: I5e1a2bfb097569e719e88441b076cc03effce580
parents ebb1d94c 4e75d8b4

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

+1 −3
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ public class Events { 
    public static final int DISMISS_STREAM_GONE = 7;

    public static final int DISMISS_REASON_OUTPUT_CHOOSER = 8;

    public static final int DISMISS_REASON_USB_OVERHEAD_ALARM_CHANGED = 9;

    public static final int DISMISS_REASON_ODI_CAPTIONS_CLICKED = 10;

    public static final String[] DISMISS_REASONS = {

            "unknown",

            "touch_outside",
@@ -105,8 +104,7 @@ public class Events { 
            "done_clicked",

            "a11y_stream_changed",

            "output_chooser",

            "usb_temperature_below_threshold",

            "odi_captions_clicked"

            "usb_temperature_below_threshold"

    };



    public static final int SHOW_REASON_UNKNOWN = 0;

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

+0 −2
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import static android.view.View.GONE; 
import static android.view.View.VISIBLE;

import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;



import static com.android.systemui.volume.Events.DISMISS_REASON_ODI_CAPTIONS_CLICKED;

import static com.android.systemui.volume.Events.DISMISS_REASON_SETTINGS_CLICKED;



import android.animation.ObjectAnimator;
@@ -519,7 +518,6 @@ public class VolumeDialogImpl implements VolumeDialog, 
            mODICaptionsIcon.setOnConfirmedTapListener(() -> {

                onCaptionIconClicked();

                Events.writeEvent(mContext, Events.EVENT_ODI_CAPTIONS_CLICK);

                dismissH(DISMISS_REASON_ODI_CAPTIONS_CLICKED);

            }, mHandler);

        }