am 1da56b51: Merge "Make WindowInsets#hasInsets check for stable insets as well" into mnc-dev

* commit '1da56b51d59aa4c587dcdb5bf4c1719961be0ae7': Make WindowInsets#hasInsets check for stable insets as well
2015-06-04 20:07:04 +00:00
parent 4780ef23ba 1da56b51d5
commit cce32a8290
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/view/WindowInsets.java
+++ b/core/java/android/view/WindowInsets.java
@@ -251,7 +251,7 @@ public final class WindowInsets {
     * @return true if any inset values are nonzero
     */
    public boolean hasInsets() {
-        return hasSystemWindowInsets() || hasWindowDecorInsets();
+        return hasSystemWindowInsets() || hasWindowDecorInsets() || hasStableInsets();
    }

    /**