From 3e419ebbf1e9b4aff689d8a6475f532eca907693 Mon Sep 17 00:00:00 2001 From: mpodolian Date: Mon, 9 Dec 2024 15:27:48 -0800 Subject: [PATCH] Remove usage of the enableBubbleBarInPersistentTaskBar flag. Remove and merge the usage of the enableBubbleBarInPersistentTaskBar flag to the enableBubbleBar flag. Bug: 383181643 Flag: com.android.wm.shell.enable_bubble_bar Test: NONE - removed and merged flag usage. Change-Id: I4f131e1ddf8367425b91c8fb597857ee222b75d8 --- .../launcher3/taskbar/NavbarButtonsViewController.java | 4 +--- .../launcher3/taskbar/TaskbarActivityContext.java | 9 ++------- .../src/com/android/launcher3/taskbar/TaskbarView.java | 4 ++-- .../android/launcher3/taskbar/TaskbarViewCallbacks.java | 8 +++----- .../android/launcher3/taskbar/TaskbarViewController.java | 4 +--- .../android/launcher3/uioverrides/QuickstepLauncher.java | 5 +---- src/com/android/launcher3/DeviceProfile.java | 2 -- 7 files changed, 10 insertions(+), 26 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java index 9ee4b954d6..1144ac5ca1 100644 --- a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java @@ -51,7 +51,6 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_S import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SHORTCUT_HELPER_SHOWING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING; import static com.android.window.flags.Flags.predictiveBackThreeButtonNav; -import static com.android.wm.shell.Flags.enableBubbleBarInPersistentTaskBar; import android.animation.Animator; import android.animation.ArgbEvaluator; @@ -1348,8 +1347,7 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT || mNavButtonsView.getWidth() == 0) { return; } - if (enableBubbleBarInPersistentTaskBar() - && mControllers.bubbleControllers.isPresent()) { + if (mControllers.bubbleControllers.isPresent()) { if (mBubbleBarTargetLocation == null) { // only set bubble bar location if it was not set before mBubbleBarTargetLocation = mControllers.bubbleControllers.get() diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java index 8e2246bfdb..107facf023 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java @@ -163,7 +163,6 @@ import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags; import com.android.systemui.unfold.updates.RotationChangeProvider; import com.android.systemui.unfold.util.ScopedUnfoldTransitionProgressProvider; -import com.android.wm.shell.Flags; import java.io.PrintWriter; import java.util.Collections; @@ -277,12 +276,8 @@ public class TaskbarActivityContext extends BaseTaskbarContext { TaskbarScrimView taskbarScrimView = mDragLayer.findViewById(R.id.taskbar_scrim); NearestTouchFrame navButtonsView = mDragLayer.findViewById(R.id.navbuttons_view); StashedHandleView stashedHandleView = mDragLayer.findViewById(R.id.stashed_handle); - BubbleBarView bubbleBarView = null; - FrameLayout bubbleBarContainer = null; - if (isTransientTaskbar || Flags.enableBubbleBarInPersistentTaskBar()) { - bubbleBarView = mDragLayer.findViewById(R.id.taskbar_bubbles); - bubbleBarContainer = mDragLayer.findViewById(R.id.taskbar_bubbles_container); - } + BubbleBarView bubbleBarView = mDragLayer.findViewById(R.id.taskbar_bubbles); + FrameLayout bubbleBarContainer = mDragLayer.findViewById(R.id.taskbar_bubbles_container); StashedHandleView bubbleHandleView = mDragLayer.findViewById(R.id.stashed_bubble_handle); mAccessibilityDelegate = new TaskbarShortcutMenuAccessibilityDelegate(this); diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java index de9eee4a3b..741853eb80 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java @@ -772,7 +772,7 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar * aligned - returns 0. */ public float getTranslationXForBubbleBarPosition(BubbleBarLocation location) { - if (!mControllerCallbacks.isBubbleBarEnabledInPersistentTaskbar() + if (!mControllerCallbacks.isBubbleBarEnabled() || location == mBubbleBarLocation || !mActivityContext.shouldStartAlignTaskbar() ) { @@ -792,7 +792,7 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar int iconEnd = centerAlignIconEnd; if (mShouldTryStartAlign) { int startSpacingPx = deviceProfile.inlineNavButtonsEndSpacingPx; - if (mControllerCallbacks.isBubbleBarEnabledInPersistentTaskbar() + if (mControllerCallbacks.isBubbleBarEnabled() && mBubbleBarLocation != null && mActivityContext.shouldStartAlignTaskbar()) { iconEnd = (int) getTaskBarIconsEndForBubbleBarLocation(mBubbleBarLocation); diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewCallbacks.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewCallbacks.java index c7841c1340..dddfdfe31a 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewCallbacks.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewCallbacks.java @@ -36,7 +36,6 @@ import com.android.internal.jank.Cuj; import com.android.launcher3.taskbar.bubbles.BubbleBarViewController; import com.android.launcher3.util.DisplayController; import com.android.systemui.shared.system.InteractionJankMonitorWrapper; -import com.android.wm.shell.Flags; import com.android.wm.shell.shared.bubbles.BubbleBarLocation; /** @@ -159,10 +158,9 @@ public class TaskbarViewCallbacks { .orElse(0f); } - /** Returns true if bubble bar controllers present and enabled in persistent taskbar. */ - public boolean isBubbleBarEnabledInPersistentTaskbar() { - return Flags.enableBubbleBarInPersistentTaskBar() - && mControllers.bubbleControllers.isPresent(); + /** Returns true if bubble bar controllers are present. */ + public boolean isBubbleBarEnabled() { + return mControllers.bubbleControllers.isPresent(); } /** Returns on click listener for the taskbar overflow view. */ diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java index 89f4f5959a..438478f275 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java @@ -90,7 +90,6 @@ import com.android.launcher3.util.MultiTranslateDelegate; import com.android.launcher3.util.MultiValueAlpha; import com.android.quickstep.util.GroupTask; import com.android.systemui.shared.recents.model.Task; -import com.android.wm.shell.Flags; import com.android.wm.shell.shared.bubbles.BubbleBarLocation; import java.io.PrintWriter; @@ -303,8 +302,7 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar /** Returns whether taskbar should be moved on the bubble bar location update. */ private boolean shouldMoveTaskbarOnBubbleBarLocationUpdate() { - return Flags.enableBubbleBarInPersistentTaskBar() - && mControllers.bubbleControllers.isPresent() + return mControllers.bubbleControllers.isPresent() && mActivity.shouldStartAlignTaskbar() && mActivity.isThreeButtonNav(); } diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java index eeac16917c..3fd9970a52 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java +++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java @@ -65,7 +65,6 @@ import static com.android.quickstep.util.AnimUtils.completeRunnableListCallback; import static com.android.quickstep.util.SplitAnimationTimings.TABLET_HOME_TO_SPLIT; import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY; import static com.android.wm.shell.Flags.enableBubbleAnything; -import static com.android.wm.shell.Flags.enableBubbleBarInPersistentTaskBar; import static com.android.wm.shell.shared.split.SplitScreenConstants.SNAP_TO_2_50_50; import android.animation.Animator; @@ -1134,9 +1133,7 @@ public class QuickstepLauncher extends Launcher implements RecentsViewContainer, /** Provides the translation X for the hotseat item. */ public int getHotseatItemTranslationX(ItemInfo itemInfo) { int translationX = 0; - if (isBubbleBarEnabled() - && enableBubbleBarInPersistentTaskBar() - && mBubbleBarLocation != null) { + if (isBubbleBarEnabled() && mBubbleBarLocation != null) { boolean isBubblesOnLeft = mBubbleBarLocation.isOnLeft(isRtl(getResources())); translationX += mDeviceProfile .getHotseatTranslationXForNavBar(this, isBubblesOnLeft); diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index f1274dc74a..5387815cd7 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -33,7 +33,6 @@ import static com.android.launcher3.testing.shared.ResourceUtils.INVALID_RESOURC import static com.android.launcher3.testing.shared.ResourceUtils.pxFromDp; import static com.android.launcher3.testing.shared.ResourceUtils.roundPxValueFromFloat; import static com.android.wm.shell.Flags.enableBubbleBar; -import static com.android.wm.shell.Flags.enableBubbleBarInPersistentTaskBar; import static com.android.wm.shell.Flags.enableTinyTaskbar; import android.annotation.SuppressLint; @@ -2433,7 +2432,6 @@ public class DeviceProfile { */ public boolean shouldAdjustHotseatOnNavBarLocationUpdate(Context context) { return enableBubbleBar() - && enableBubbleBarInPersistentTaskBar() && !DisplayController.getNavigationMode(context).hasGestures; }