Merge "Keep reporting > 0 insets on home screen" into tm-dev am: 808b6c2fed

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17084127

Change-Id: Ia8209ca860ad9bb0080bf77ef8a3a352ec1b0461
This commit is contained in:
Tony Wickham
2022-03-09 22:38:37 +00:00
committed by Automerger Merge Worker
@@ -250,7 +250,11 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
* Returns whether the taskbar is currently visible and in an app.
*/
public boolean isInAppAndNotStashed() {
return !mIsStashed && (mState & FLAG_IN_APP) != 0;
return !mIsStashed && isInApp();
}
private boolean isInApp() {
return hasAnyFlag(FLAG_IN_APP);
}
/**
@@ -266,8 +270,15 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
return mUnstashedHeight;
}
boolean isAnimating = mAnimator != null && mAnimator.isStarted();
return mControllers.stashedHandleViewController.isStashedHandleVisible() || isAnimating
? mStashedHeight : 0;
if (!mControllers.stashedHandleViewController.isStashedHandleVisible()
&& isInApp()
&& !isAnimating) {
// We are in a settled state where we're not showing the handle even though taskbar
// is stashed. This can happen for example when home button is disabled (see
// StashedHandleViewController#setIsHomeButtonDisabled()).
return 0;
}
return mStashedHeight;
}
return mUnstashedHeight;
}