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

Merge "Fix UIEvent ID collision." into rvc-dev am: c92f717dee

Browse Source 
Change-Id: I00764b5561d0edaa7ae1a1b07885d5c88690ab1b
This commit is contained in:
Will Brockman
2020-03-19 17:28:03 +00:00
committed by Automerger Merge Worker
parent 6f3047bc27 c92f717dee
commit 03cd85ca4d
1 changed files with 2 additions and 2 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

@@ -238,7 +238,7 @@ public class Events {
@UiEvent(doc = "The ringer mode was toggled to vibrate") @UiEvent(doc = "The ringer mode was toggled to vibrate")
RINGER_MODE_VIBRATE(155), RINGER_MODE_VIBRATE(155),
@UiEvent(doc = "The ringer mode was toggled to normal") @UiEvent(doc = "The ringer mode was toggled to normal")
RINGER_MODE_NORMAL(156), RINGER_MODE_NORMAL(334),
@UiEvent(doc = "USB Overheat alarm was raised") @UiEvent(doc = "USB Overheat alarm was raised")
USB_OVERHEAT_ALARM(160), USB_OVERHEAT_ALARM(160),
@UiEvent(doc = "USB Overheat alarm was dismissed") @UiEvent(doc = "USB Overheat alarm was dismissed")
@@ -293,7 +293,7 @@ public class Events {
public enum ZenModeEvent implements UiEventLogger.UiEventEnum { public enum ZenModeEvent implements UiEventLogger.UiEventEnum {
INVALID(0), INVALID(0),
@UiEvent(doc = "Zen (do not disturb) mode was toggled to off") @UiEvent(doc = "Zen (do not disturb) mode was toggled to off")
ZEN_MODE_OFF(156), ZEN_MODE_OFF(335),
@UiEvent(doc = "Zen (do not disturb) mode was toggled to important interruptions only") @UiEvent(doc = "Zen (do not disturb) mode was toggled to important interruptions only")
ZEN_MODE_IMPORTANT_ONLY(157), ZEN_MODE_IMPORTANT_ONLY(157),
@UiEvent(doc = "Zen (do not disturb) mode was toggled to alarms only") @UiEvent(doc = "Zen (do not disturb) mode was toggled to alarms only")