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

Merge "Change getSystemUiStateString to not contain excess pipe characters" into tm-qpr-dev

Browse Source
This commit is contained in:
Mike Schneider
2023-03-17 07:54:32 +00:00
committed by Android (Google) Code Review
parent 64754c34cf 59734155bf
commit 3aecf9a970
1 changed files with 90 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java
View File

@@ -172,42 +172,96 @@ public class QuickStepContract {
public static String getSystemUiStateString(int flags) { public static String getSystemUiStateString(int flags) {
StringJoiner str = new StringJoiner("|"); StringJoiner str = new StringJoiner("|");
str.add((flags & SYSUI_STATE_SCREEN_PINNING) != 0 ? "screen_pinned" : ""); if ((flags & SYSUI_STATE_SCREEN_PINNING) != 0) {
str.add((flags & SYSUI_STATE_OVERVIEW_DISABLED) != 0 ? "overview_disabled" : ""); str.add("screen_pinned");
str.add((flags & SYSUI_STATE_HOME_DISABLED) != 0 ? "home_disabled" : ""); }
str.add((flags & SYSUI_STATE_SEARCH_DISABLED) != 0 ? "search_disabled" : ""); if ((flags & SYSUI_STATE_OVERVIEW_DISABLED) != 0) {
str.add((flags & SYSUI_STATE_NAV_BAR_HIDDEN) != 0 ? "navbar_hidden" : ""); str.add("overview_disabled");
str.add((flags & SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED) != 0 ? "notif_visible" : ""); }
str.add((flags & SYSUI_STATE_QUICK_SETTINGS_EXPANDED) != 0 ? "qs_visible" : ""); if ((flags & SYSUI_STATE_HOME_DISABLED) != 0) {
str.add((flags & SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING) != 0 ? "keygrd_visible" : ""); str.add("home_disabled");
str.add((flags & SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED) != 0 }
? "keygrd_occluded" : ""); if ((flags & SYSUI_STATE_SEARCH_DISABLED) != 0) {
str.add((flags & SYSUI_STATE_BOUNCER_SHOWING) != 0 ? "bouncer_visible" : ""); str.add("search_disabled");
str.add((flags & SYSUI_STATE_DIALOG_SHOWING) != 0 ? "dialog_showing" : ""); }
str.add((flags & SYSUI_STATE_A11Y_BUTTON_CLICKABLE) != 0 ? "a11y_click" : ""); if ((flags & SYSUI_STATE_NAV_BAR_HIDDEN) != 0) {
str.add((flags & SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE) != 0 ? "a11y_long_click" : ""); str.add("navbar_hidden");
str.add((flags & SYSUI_STATE_TRACING_ENABLED) != 0 ? "tracing" : ""); }
str.add((flags & SYSUI_STATE_ASSIST_GESTURE_CONSTRAINED) != 0 if ((flags & SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED) != 0) {
? "asst_gesture_constrain" : ""); str.add("notif_visible");
str.add((flags & SYSUI_STATE_BUBBLES_EXPANDED) != 0 ? "bubbles_expanded" : ""); }
str.add((flags & SYSUI_STATE_ONE_HANDED_ACTIVE) != 0 ? "one_handed_active" : ""); if ((flags & SYSUI_STATE_QUICK_SETTINGS_EXPANDED) != 0) {
str.add((flags & SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY) != 0 str.add("qs_visible");
? "allow_gesture" : ""); }
str.add((flags & SYSUI_STATE_IME_SHOWING) != 0 ? "ime_visible" : ""); if ((flags & SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING) != 0) {
str.add((flags & SYSUI_STATE_MAGNIFICATION_OVERLAP) != 0 ? "magnification_overlap" : ""); str.add("keygrd_visible");
str.add((flags & SYSUI_STATE_IME_SWITCHER_SHOWING) != 0 ? "ime_switcher_showing" : ""); }
str.add((flags & SYSUI_STATE_DEVICE_DOZING) != 0 ? "device_dozing" : ""); if ((flags & SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED) != 0) {
str.add((flags & SYSUI_STATE_BACK_DISABLED) != 0 ? "back_disabled" : ""); str.add("keygrd_occluded");
str.add((flags & SYSUI_STATE_BUBBLES_MANAGE_MENU_EXPANDED) != 0 }
? "bubbles_mange_menu_expanded" : ""); if ((flags & SYSUI_STATE_BOUNCER_SHOWING) != 0) {
str.add((flags & SYSUI_STATE_IMMERSIVE_MODE) != 0 ? "immersive_mode" : ""); str.add("bouncer_visible");
str.add((flags & SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING) != 0 ? "vis_win_showing" : ""); }
str.add((flags & SYSUI_STATE_FREEFORM_ACTIVE_IN_DESKTOP_MODE) != 0 if ((flags & SYSUI_STATE_DIALOG_SHOWING) != 0) {
? "freeform_active_in_desktop_mode" : ""); str.add("dialog_showing");
str.add((flags & SYSUI_STATE_DEVICE_DREAMING) != 0 ? "device_dreaming" : ""); }
str.add("screen_" if ((flags & SYSUI_STATE_A11Y_BUTTON_CLICKABLE) != 0) {
+ ((flags & SYSUI_STATE_SCREEN_TRANSITION) != 0 ? "turning_" : "") str.add("a11y_click");
+ ((flags & SYSUI_STATE_SCREEN_ON) != 0 ? "on" : "off")); }
if ((flags & SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE) != 0) {
str.add("a11y_long_click");
}
if ((flags & SYSUI_STATE_TRACING_ENABLED) != 0) {
str.add("tracing");
}
if ((flags & SYSUI_STATE_ASSIST_GESTURE_CONSTRAINED) != 0) {
str.add("asst_gesture_constrain");
}
if ((flags & SYSUI_STATE_BUBBLES_EXPANDED) != 0) {
str.add("bubbles_expanded");
}
if ((flags & SYSUI_STATE_ONE_HANDED_ACTIVE) != 0) {
str.add("one_handed_active");
}
if ((flags & SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY) != 0) {
str.add("allow_gesture");
}
if ((flags & SYSUI_STATE_IME_SHOWING) != 0) {
str.add("ime_visible");
}
if ((flags & SYSUI_STATE_MAGNIFICATION_OVERLAP) != 0) {
str.add("magnification_overlap");
}
if ((flags & SYSUI_STATE_IME_SWITCHER_SHOWING) != 0) {
str.add("ime_switcher_showing");
}
if ((flags & SYSUI_STATE_DEVICE_DOZING) != 0) {
str.add("device_dozing");
}
if ((flags & SYSUI_STATE_BACK_DISABLED) != 0) {
str.add("back_disabled");
}
if ((flags & SYSUI_STATE_BUBBLES_MANAGE_MENU_EXPANDED) != 0) {
str.add("bubbles_mange_menu_expanded");
}
if ((flags & SYSUI_STATE_IMMERSIVE_MODE) != 0) {
str.add("immersive_mode");
}
if ((flags & SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING) != 0) {
str.add("vis_win_showing");
}
if ((flags & SYSUI_STATE_FREEFORM_ACTIVE_IN_DESKTOP_MODE) != 0) {
str.add("freeform_active_in_desktop_mode");
}
if ((flags & SYSUI_STATE_DEVICE_DREAMING) != 0) {
str.add("device_dreaming");
}
if ((flags & SYSUI_STATE_SCREEN_TRANSITION) != 0) {
str.add("screen_transition");
}
if ((flags & SYSUI_STATE_SCREEN_ON) != 0) {
str.add("screen_on");
}
return str.toString(); return str.toString();
} }