Merge "Keep reporting > 0 insets on home screen" into tm-dev

2022-03-09 22:37:13 +00:00
parent d586e1948b 3e7415df56
commit 808b6c2fed
1 changed files with 14 additions and 3 deletions
@@ -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;
    }