summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jorim Jaggi <jjaggi@google.com> 2020-04-02 11:21:22 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-04-02 11:21:22 +0000
commitd80aee2ed8078efa40da2355d9a098994485fce2 (patch)
tree96c8a6afc883604bce8a4dee003ddf471290cd3b
parentfd3f01df12ac64c90e0b34707d0db0edee30f0ab (diff)
parent9ab688d487b50fe14a6b510d44d847908c36d6d6 (diff)
Merge "WindowInsets: Ignore consumeStableInsets()" into rvc-dev
-rw-r--r--core/java/android/view/WindowInsets.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/view/WindowInsets.java b/core/java/android/view/WindowInsets.java
index 33a45f170164..ca3dd04fd756 100644
--- a/core/java/android/view/WindowInsets.java
+++ b/core/java/android/view/WindowInsets.java
@@ -818,12 +818,13 @@ public final class WindowInsets {
* @return A modified copy of this WindowInsets
* @deprecated Consuming of different parts individually of a {@link WindowInsets} instance is
* deprecated, since {@link WindowInsets} contains many different insets. Use {@link #CONSUMED}
- * instead to stop dispatching insets.
+ * instead to stop dispatching insets. On {@link android.os.Build.VERSION_CODES#R R}, this
+ * method has no effect.
*/
@Deprecated
@NonNull
public WindowInsets consumeStableInsets() {
- return consumeSystemWindowInsets();
+ return this;
}
/**