Added taskbar in/out animation when the bubble bar is expanded/collapsed
Added taskbar icon animation when the bubble bar expansion changes. If there is enough space to accommodate both bars with spacing in between, the taskbar remains. If there is not enough space, the taskbar is animated out and then animated in when the bubble bar is collapsed. Bug: 346391377 Flag: com.android.wm.shell.enable_bubble_bar Test: Manual. Set taskbar to persistent mode via 3-button navigation or through the taskbar itself. Have enough bubbles to cover the taskbar when the bubble bar is extended. Expand the bubble bar and observe the taskbar icons animating out. Remove a few bubbles so there is enough space to accommodate both bars. Expand the bubble bar and observe that both bars are visible. Change-Id: I0b03a010c1e49ab39a17934f6629d5496fd66978
This commit is contained in:
1 parent
eeb98c8e75
commit
6ba789a98f
7 files changed
+117
-14
No files matched your search
@@ -28,6 +28,7 @@ import android.view.animation.Interpolator;
|
||||
import android.view.animation.PathInterpolator;
|
||||
|
||||
import com.android.launcher3.anim.AnimatedFloat;
|
||||
import com.android.launcher3.taskbar.bubbles.BubbleControllers;
|
||||
import com.android.launcher3.util.DisplayController;
|
||||
import com.android.quickstep.SystemUiProxy;
|
||||
import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags;
|
||||
@@ -97,10 +98,20 @@ public class TaskbarScrimViewController implements TaskbarControllers.LoggableTa
|
||||
private boolean shouldShowScrim() {
|
||||
final boolean bubblesExpanded = (mSysUiStateFlags & SYSUI_STATE_BUBBLES_EXPANDED) != 0;
|
||||
boolean isShadeVisible = (mSysUiStateFlags & SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE) != 0;
|
||||
BubbleControllers bubbleControllers = mActivity.getBubbleControllers();
|
||||
boolean isBubbleControllersPresented = bubbleControllers != null;
|
||||
// when the taskbar is in persistent mode, we hide the task bar icons on bubble bar expand,
|
||||
// which makes the taskbar invisible, so need to check if the bubble bar is not on home
|
||||
// to show the scrim view
|
||||
boolean showScrimForBubbles = bubblesExpanded
|
||||
&& !mTaskbarVisible
|
||||
&& isBubbleControllersPresented
|
||||
&& !DisplayController.isTransientTaskbar(mActivity)
|
||||
&& !bubbleControllers.bubbleStashController.isBubblesShowingOnHome();
|
||||
return bubblesExpanded && !mControllers.navbarButtonsViewController.isImeVisible()
|
||||
&& !isShadeVisible
|
||||
&& !mControllers.taskbarStashController.isStashed()
|
||||
&& mTaskbarVisible;
|
||||
&& (mTaskbarVisible || showScrimForBubbles);
|
||||
}
|
||||
|
||||
private float getScrimAlpha() {
|
||||
|
||||
Reference in new issue
Block a user