From 0439fcdd5c131937a6a01873febf42af566bcb0a Mon Sep 17 00:00:00 2001 From: Tracy Zhou Date: Thu, 31 Mar 2022 15:35:20 -0700 Subject: [PATCH] Do not append additional delimiters Fixes: 227665358 Test: N/A Change-Id: I6ec0bca286c0824e474f04a61b7d855858490120 --- .../taskbar/NavbarButtonsViewController.java | 29 ++++++++-------- .../TaskbarAutohideSuspendController.java | 9 ++--- .../taskbar/TaskbarStashController.java | 20 +++++------ .../android/launcher3/taskbar/Utilities.java | 33 +++++++++++++++++++ 4 files changed, 63 insertions(+), 28 deletions(-) create mode 100644 quickstep/src/com/android/launcher3/taskbar/Utilities.java diff --git a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java index ca0767b642..175a1d92b2 100644 --- a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java @@ -22,6 +22,7 @@ import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_HO import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_IME_SWITCH; import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_RECENTS; import static com.android.launcher3.taskbar.TaskbarViewController.ALPHA_INDEX_KEYGUARD; +import static com.android.launcher3.taskbar.Utilities.appendFlag; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_CLICKABLE; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BACK_DISABLED; @@ -693,20 +694,20 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT private static String getStateString(int flags) { StringJoiner str = new StringJoiner("|"); - str.add((flags & FLAG_SWITCHER_SUPPORTED) != 0 ? "FLAG_SWITCHER_SUPPORTED" : ""); - str.add((flags & FLAG_IME_VISIBLE) != 0 ? "FLAG_IME_VISIBLE" : ""); - str.add((flags & FLAG_ROTATION_BUTTON_VISIBLE) != 0 ? "FLAG_ROTATION_BUTTON_VISIBLE" : ""); - str.add((flags & FLAG_A11Y_VISIBLE) != 0 ? "FLAG_A11Y_VISIBLE" : ""); - str.add((flags & FLAG_ONLY_BACK_FOR_BOUNCER_VISIBLE) != 0 - ? "FLAG_ONLY_BACK_FOR_BOUNCER_VISIBLE" : ""); - str.add((flags & FLAG_KEYGUARD_VISIBLE) != 0 ? "FLAG_KEYGUARD_VISIBLE" : ""); - str.add((flags & FLAG_KEYGUARD_OCCLUDED) != 0 ? "FLAG_KEYGUARD_OCCLUDED" : ""); - str.add((flags & FLAG_DISABLE_HOME) != 0 ? "FLAG_DISABLE_HOME" : ""); - str.add((flags & FLAG_DISABLE_RECENTS) != 0 ? "FLAG_DISABLE_RECENTS" : ""); - str.add((flags & FLAG_DISABLE_BACK) != 0 ? "FLAG_DISABLE_BACK" : ""); - str.add((flags & FLAG_NOTIFICATION_SHADE_EXPANDED) != 0 - ? "FLAG_NOTIFICATION_SHADE_EXPANDED" : ""); - str.add((flags & FLAG_SCREEN_PINNING_ACTIVE) != 0 ? "FLAG_SCREEN_PINNING_ACTIVE" : ""); + appendFlag(str, flags, FLAG_SWITCHER_SUPPORTED, "FLAG_SWITCHER_SUPPORTED"); + appendFlag(str, flags, FLAG_IME_VISIBLE, "FLAG_IME_VISIBLE"); + appendFlag(str, flags, FLAG_ROTATION_BUTTON_VISIBLE, "FLAG_ROTATION_BUTTON_VISIBLE"); + appendFlag(str, flags, FLAG_A11Y_VISIBLE, "FLAG_A11Y_VISIBLE"); + appendFlag(str, flags, FLAG_ONLY_BACK_FOR_BOUNCER_VISIBLE, + "FLAG_ONLY_BACK_FOR_BOUNCER_VISIBLE"); + appendFlag(str, flags, FLAG_KEYGUARD_VISIBLE, "FLAG_KEYGUARD_VISIBLE"); + appendFlag(str, flags, FLAG_KEYGUARD_OCCLUDED, "FLAG_KEYGUARD_OCCLUDED"); + appendFlag(str, flags, FLAG_DISABLE_HOME, "FLAG_DISABLE_HOME"); + appendFlag(str, flags, FLAG_DISABLE_RECENTS, "FLAG_DISABLE_RECENTS"); + appendFlag(str, flags, FLAG_DISABLE_BACK, "FLAG_DISABLE_BACK"); + appendFlag(str, flags, FLAG_NOTIFICATION_SHADE_EXPANDED, + "FLAG_NOTIFICATION_SHADE_EXPANDED"); + appendFlag(str, flags, FLAG_SCREEN_PINNING_ACTIVE, "FLAG_SCREEN_PINNING_ACTIVE"); return str.toString(); } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarAutohideSuspendController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarAutohideSuspendController.java index 31a6aa6977..c5615c7ba1 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarAutohideSuspendController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarAutohideSuspendController.java @@ -15,6 +15,8 @@ */ package com.android.launcher3.taskbar; +import static com.android.launcher3.taskbar.Utilities.appendFlag; + import androidx.annotation.IntDef; import com.android.quickstep.SystemUiProxy; @@ -75,10 +77,9 @@ public class TaskbarAutohideSuspendController implements private static String getStateString(int flags) { StringJoiner str = new StringJoiner("|"); - str.add((flags & FLAG_AUTOHIDE_SUSPEND_FULLSCREEN) != 0 - ? "FLAG_AUTOHIDE_SUSPEND_FULLSCREEN" : ""); - str.add((flags & FLAG_AUTOHIDE_SUSPEND_DRAGGING) != 0 - ? "FLAG_AUTOHIDE_SUSPEND_DRAGGING" : ""); + appendFlag(str, flags, FLAG_AUTOHIDE_SUSPEND_FULLSCREEN, + "FLAG_AUTOHIDE_SUSPEND_FULLSCREEN"); + appendFlag(str, flags, FLAG_AUTOHIDE_SUSPEND_DRAGGING, "FLAG_AUTOHIDE_SUSPEND_DRAGGING"); return str.toString(); } } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java index 54dd0b2379..06107b8904 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java @@ -19,6 +19,7 @@ import static android.view.HapticFeedbackConstants.LONG_PRESS; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_LONGPRESS_HIDE; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_LONGPRESS_SHOW; +import static com.android.launcher3.taskbar.Utilities.appendFlag; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_PINNING; @@ -606,16 +607,15 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba private static String getStateString(int flags) { StringJoiner str = new StringJoiner("|"); - str.add((flags & FLAG_IN_APP) != 0 ? "FLAG_IN_APP" : ""); - str.add((flags & FLAG_STASHED_IN_APP_MANUAL) != 0 ? "FLAG_STASHED_IN_APP_MANUAL" : ""); - str.add((flags & FLAG_STASHED_IN_APP_PINNED) != 0 ? "FLAG_STASHED_IN_APP_PINNED" : ""); - str.add((flags & FLAG_STASHED_IN_APP_EMPTY) != 0 ? "FLAG_STASHED_IN_APP_EMPTY" : ""); - str.add((flags & FLAG_STASHED_IN_APP_SETUP) != 0 ? "FLAG_STASHED_IN_APP_SETUP" : ""); - str.add((flags & FLAG_STASHED_IN_APP_IME) != 0 ? "FLAG_STASHED_IN_APP_IME" : ""); - str.add((flags & FLAG_IN_STASHED_LAUNCHER_STATE) != 0 - ? "FLAG_IN_STASHED_LAUNCHER_STATE" : ""); - str.add((flags & FLAG_STASHED_IN_APP_ALL_APPS) != 0 ? "FLAG_STASHED_IN_APP_ALL_APPS" : ""); - str.add((flags & FLAG_IN_SETUP) != 0 ? "FLAG_IN_SETUP" : ""); + appendFlag(str, flags, FLAGS_IN_APP, "FLAG_IN_APP"); + appendFlag(str, flags, FLAG_STASHED_IN_APP_MANUAL, "FLAG_STASHED_IN_APP_MANUAL"); + appendFlag(str, flags, FLAG_STASHED_IN_APP_PINNED, "FLAG_STASHED_IN_APP_PINNED"); + appendFlag(str, flags, FLAG_STASHED_IN_APP_EMPTY, "FLAG_STASHED_IN_APP_EMPTY"); + appendFlag(str, flags, FLAG_STASHED_IN_APP_SETUP, "FLAG_STASHED_IN_APP_SETUP"); + appendFlag(str, flags, FLAG_STASHED_IN_APP_IME, "FLAG_STASHED_IN_APP_IME"); + appendFlag(str, flags, FLAG_IN_STASHED_LAUNCHER_STATE, "FLAG_IN_STASHED_LAUNCHER_STATE"); + appendFlag(str, flags, FLAG_STASHED_IN_APP_ALL_APPS, "FLAG_STASHED_IN_APP_ALL_APPS"); + appendFlag(str, flags, FLAG_IN_SETUP, "FLAG_IN_SETUP"); return str.toString(); } diff --git a/quickstep/src/com/android/launcher3/taskbar/Utilities.java b/quickstep/src/com/android/launcher3/taskbar/Utilities.java new file mode 100644 index 0000000000..fda6453e7d --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/Utilities.java @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.launcher3.taskbar; + +import java.util.StringJoiner; + +/** + * Various utilities shared amongst the Taskbar's classes. + */ +public final class Utilities { + + private Utilities() {} + + static void appendFlag(StringJoiner str, int flags, int flag, String flagName) { + if ((flags & flag) != 0) { + str.add(flagName); + } + } +}