diff options
author | Adam Powell <adamp@google.com> | 2015-06-04 19:49:33 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-04 19:49:36 +0000 |
commit | 1da56b51d59aa4c587dcdb5bf4c1719961be0ae7 (patch) | |
tree | 2afacf762fd54ab68a0fc326e79543ad16c43982 | |
parent | 43e77bf6209bd964bd9cc568b5f37b26401956b3 (diff) | |
parent | 05e967820dc71286b743294af0e80e2939ff9738 (diff) | |
download | frameworks_base-1da56b51d59aa4c587dcdb5bf4c1719961be0ae7.zip frameworks_base-1da56b51d59aa4c587dcdb5bf4c1719961be0ae7.tar.gz frameworks_base-1da56b51d59aa4c587dcdb5bf4c1719961be0ae7.tar.bz2 |
Merge "Make WindowInsets#hasInsets check for stable insets as well" into mnc-dev
-rw-r--r-- | core/java/android/view/WindowInsets.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ public final class WindowInsets { * @return true if any inset values are nonzero */ public boolean hasInsets() { - return hasSystemWindowInsets() || hasWindowDecorInsets(); + return hasSystemWindowInsets() || hasWindowDecorInsets() || hasStableInsets(); } /** |