commit cce32a829054a9ba4d5dd8774ead9d1ef6c92017
author Adam Powell <adamp@google.com> Thu Jun 04 20:07:04 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 04 20:07:04 2015 +0000
tree a2e75919581c7db36ec76f46b2b16780d73d1074
parent 4780ef23baea5278680350ccf40694abd2d1b5c0
parent 1da56b51d59aa4c587dcdb5bf4c1719961be0ae7

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

core/java/android/view/WindowInsets.java

diff --git a/core/java/android/view/WindowInsets.java b/core/java/android/view/WindowInsets.java
index 9e0719d..997e7e8 100644
--- a/core/java/android/view/WindowInsets.java
+++ b/core/java/android/view/WindowInsets.java
@@ -251,7 +251,7 @@
      * @return true if any inset values are nonzero
      */
     public boolean hasInsets() {
-        return hasSystemWindowInsets() || hasWindowDecorInsets();
+        return hasSystemWindowInsets() || hasWindowDecorInsets() || hasStableInsets();
     }
 
     /**