aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 10:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Explicitly set which taskbar view is visible at each caller" into sc-dev

Browse Source
This commit is contained in:
Tony Wickham
2021-04-06 19:37:18 +00:00
committed by Android (Google) Code Review
parent 0b0c173ec0 6a74e65953
commit fc3bc6098f
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
View File

@@ -89,7 +89,6 @@ public class TaskbarController {
private @Nullable Animator mAnimator;
private boolean mIsAnimatingToLauncher;
private boolean mIsAnimatingToApp;
public TaskbarController(BaseQuickstepLauncher launcher,
TaskbarContainerView taskbarContainerView, TaskbarView taskbarViewOnHome) {
@@ -258,7 +257,9 @@ public class TaskbarController {
mHotseatController.init();
mRecentsController.init();
updateWhichTaskbarViewIsVisible();
setWhichTaskbarViewIsVisible(mLauncher.hasBeenResumed()
? mTaskbarViewOnHome
: mTaskbarViewInApp);
}
private TaskbarStateHandlerCallbacks createTaskbarStateHandlerCallbacks() {
@@ -292,6 +293,8 @@ public class TaskbarController {
mTaskbarAnimationController.cleanup();
mHotseatController.cleanup();
mRecentsController.cleanup();
setWhichTaskbarViewIsVisible(null);
}
private void removeFromWindowManager() {
@@ -372,7 +375,7 @@ public class TaskbarController {
@Override
public void onAnimationEnd(Animator animation) {
mIsAnimatingToLauncher = false;
updateWhichTaskbarViewIsVisible();
setWhichTaskbarViewIsVisible(mTaskbarViewOnHome);
}
});
@@ -385,14 +388,12 @@ public class TaskbarController {
anim.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationStart(Animator animation) {
mIsAnimatingToApp = true;
mTaskbarViewInApp.updateHotseatItemsVisibility();
updateWhichTaskbarViewIsVisible();
setWhichTaskbarViewIsVisible(mTaskbarViewInApp);
}
@Override
public void onAnimationEnd(Animator animation) {
mIsAnimatingToApp = false;
}
});
return anim.buildAnim();
@@ -495,18 +496,12 @@ public class TaskbarController {
mTaskbarViewOnHome.getHeight() - hotseatBounds.bottom);
}
private void updateWhichTaskbarViewIsVisible() {
boolean isInApp = !mLauncher.hasBeenResumed() || mIsAnimatingToLauncher
|| mIsAnimatingToApp;
if (isInApp) {
mTaskbarViewInApp.setVisibility(View.VISIBLE);
mTaskbarViewOnHome.setVisibility(View.INVISIBLE);
mLauncher.getHotseat().setIconsAlpha(0);
} else {
mTaskbarViewInApp.setVisibility(View.INVISIBLE);
mTaskbarViewOnHome.setVisibility(View.VISIBLE);
mLauncher.getHotseat().setIconsAlpha(1);
}
private void setWhichTaskbarViewIsVisible(@Nullable TaskbarView visibleTaskbar) {
mTaskbarViewInApp.setVisibility(visibleTaskbar == mTaskbarViewInApp
? View.VISIBLE : View.INVISIBLE);
mTaskbarViewOnHome.setVisibility(visibleTaskbar == mTaskbarViewOnHome
? View.VISIBLE : View.INVISIBLE);
mLauncher.getHotseat().setIconsAlpha(visibleTaskbar != mTaskbarViewInApp ? 1f : 0f);
}
/**