diff options
| author | Adam Powell <adamp@google.com> | 2014-08-08 02:01:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-07 15:31:24 +0000 |
| commit | 2f13c9de0dbf33744d8710ea4128b8615e604a7c (patch) | |
| tree | 32bb91fb0582b040a7fdd27499acf5b8c4981b80 | |
| parent | 7516ff90015ce71e5b95c889a2211153be30c39c (diff) | |
| parent | 82a53881f1e0257f700bdca27216fc26d0c87b59 (diff) | |
| download | frameworks_base-2f13c9de0dbf33744d8710ea4128b8615e604a7c.zip frameworks_base-2f13c9de0dbf33744d8710ea4128b8615e604a7c.tar.gz frameworks_base-2f13c9de0dbf33744d8710ea4128b8615e604a7c.tar.bz2 | |
Merge "Un-hide WindowInsets#isConsumed" into lmp-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/view/WindowInsets.java | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 60a6900..aa59685 100644 --- a/api/current.txt +++ b/api/current.txt @@ -35547,6 +35547,7 @@ package android.view { method public int getSystemWindowInsetTop(); method public boolean hasInsets(); method public boolean hasSystemWindowInsets(); + method public boolean isConsumed(); method public boolean isRound(); method public android.view.WindowInsets replaceSystemWindowInsets(int, int, int, int); } diff --git a/core/java/android/view/WindowInsets.java b/core/java/android/view/WindowInsets.java index 1832cc3..571a8f0 100644 --- a/core/java/android/view/WindowInsets.java +++ b/core/java/android/view/WindowInsets.java @@ -266,7 +266,6 @@ public final class WindowInsets { * {@link View#fitSystemWindows(android.graphics.Rect)}.</p> * * @return true if the insets have been fully consumed. - * @hide Pending API */ public boolean isConsumed() { return mSystemWindowInsetsConsumed && mWindowDecorInsetsConsumed && mStableInsetsConsumed; |