PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix task bar transitions applied to unfolded task bar

Browse Source 
Bug: 350102824
Test: Task bar scrim doesn't happen
Flag: com.android.wm.shell.enable_taskbar_on_phones
Change-Id: Ib0510d9e01b30b50bd5d295b23688547b1decef3
This commit is contained in:
Tracy Zhou
2024-07-01 12:56:29 -07:00
parent adcb3d67f0
commit c97138e93d
1 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java
+38 -21
View File
@@ -247,7 +247,9 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT
? context.getColor(R.color.taskbar_nav_icon_light_color)
: context.getColor(R.color.taskbar_nav_icon_dark_color);
mTaskbarTransitions = new TaskbarTransitions(mContext, mNavButtonsView);
if (enableTaskbarOnPhones() && mContext.isPhoneButtonNavMode()) {
mTaskbarTransitions = new TaskbarTransitions(mContext, mNavButtonsView);
}
}
/**
@@ -359,7 +361,9 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT
R.bool.floating_rotation_button_position_left);
mControllers.rotationButtonController.setRotationButton(mFloatingRotationButton,
mRotationButtonListener);
mTaskbarTransitions.init();
if (enableTaskbarOnPhones() && mContext.isPhoneButtonNavMode()) {
mTaskbarTransitions.init();
}
applyState();
mPropertyHolders.forEach(StatePropertyHolder::endAnimation);
@@ -621,7 +625,9 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT
}
public void setWallpaperVisible(boolean isVisible) {
mTaskbarTransitions.setWallpaperVisibility(isVisible);
if (enableTaskbarOnPhones() && mContext.isPhoneButtonNavMode()) {
mTaskbarTransitions.setWallpaperVisibility(isVisible);
}
}
public void onTransitionModeUpdated(int barMode, boolean checkBarModes) {
@@ -632,25 +638,32 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT
}
public void checkNavBarModes() {
boolean isBarHidden = (mSysuiStateFlags & SYSUI_STATE_NAV_BAR_HIDDEN) != 0;
mTaskbarTransitions.transitionTo(mTransitionMode, !isBarHidden);
}
public void finishBarAnimations() {
mTaskbarTransitions.finishAnimations();
}
public void touchAutoDim(boolean reset) {
mTaskbarTransitions.setAutoDim(false);
mHandler.removeCallbacks(mAutoDim);
if (reset) {
mHandler.postDelayed(mAutoDim, AUTODIM_TIMEOUT_MS);
if (enableTaskbarOnPhones() && mContext.isPhoneButtonNavMode()) {
boolean isBarHidden = (mSysuiStateFlags & SYSUI_STATE_NAV_BAR_HIDDEN) != 0;
mTaskbarTransitions.transitionTo(mTransitionMode, !isBarHidden);
}
}
public void transitionTo(@BarTransitions.TransitionMode int barMode,
boolean animate) {
mTaskbarTransitions.transitionTo(barMode, animate);
public void finishBarAnimations() {
if (enableTaskbarOnPhones() && mContext.isPhoneButtonNavMode()) {
mTaskbarTransitions.finishAnimations();
}
}
public void touchAutoDim(boolean reset) {
if (enableTaskbarOnPhones() && mContext.isPhoneButtonNavMode()) {
mTaskbarTransitions.setAutoDim(false);
mHandler.removeCallbacks(mAutoDim);
if (reset) {
mHandler.postDelayed(mAutoDim, AUTODIM_TIMEOUT_MS);
}
}
}
public void transitionTo(@BarTransitions.TransitionMode int barMode, boolean animate) {
if (enableTaskbarOnPhones() && mContext.isPhoneButtonNavMode()) {
mTaskbarTransitions.transitionTo(barMode, animate);
}
}
/** Use to set the translationY for the all nav+contextual buttons */
@@ -752,7 +765,9 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT
private void onDarkIntensityChanged() {
updateNavButtonColor();
mTaskbarTransitions.onDarkIntensityChanged(mTaskbarNavButtonDarkIntensity.value);
if (enableTaskbarOnPhones() && mContext.isPhoneButtonNavMode()) {
mTaskbarTransitions.onDarkIntensityChanged(mTaskbarNavButtonDarkIntensity.value);
}
}
protected ImageView addButton(@DrawableRes int drawableId, @TaskbarButton int buttonType,
@@ -1100,7 +1115,9 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT
+ mOnBackgroundNavButtonColorOverrideMultiplier.value);
mNavButtonsView.dumpLogs(prefix + "\t", pw);
mTaskbarTransitions.dumpLogs(prefix + "\t", pw);
if (enableTaskbarOnPhones() && mContext.isPhoneButtonNavMode()) {
mTaskbarTransitions.dumpLogs(prefix + "\t", pw);
}
}
private static String getStateString(int flags) {