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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-10 12:38:49 +00:00
committed by Android (Google) Code Review
parent db54f27d0a 8eb58c2336
commit 4e75d8b4e0
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/volume/Events.java
View File

@@ -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;

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

@@ -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);
}