summaryrefslogtreecommitdiffstats
path: root/core/java/android/view
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2014-09-17 00:06:21 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-17 00:06:21 +0000
commit571ca37d0f00ec5b2c103eddebb6ae9d7c5f898c (patch)
tree605101bded50da54cc03b958140a759d9be10c73 /core/java/android/view
parente3a742f5a07576d34eb5b514c26dd7886113884d (diff)
parentaa52631f7c6b27d25328e92af9df7df880e72d54 (diff)
downloadframeworks_base-571ca37d0f00ec5b2c103eddebb6ae9d7c5f898c.zip
frameworks_base-571ca37d0f00ec5b2c103eddebb6ae9d7c5f898c.tar.gz
frameworks_base-571ca37d0f00ec5b2c103eddebb6ae9d7c5f898c.tar.bz2
am 3c782941: am 8f4cafc2: Merge "Fix broken dispatch of onApplyWindowInsets" into lmp-dev
* commit '3c782941ff6b684fe417c5c737e012342a778850': Fix broken dispatch of onApplyWindowInsets
Diffstat (limited to 'core/java/android/view')
-rw-r--r--core/java/android/view/WindowInsets.java5
1 files changed, 0 insertions, 5 deletions
diff --git a/core/java/android/view/WindowInsets.java b/core/java/android/view/WindowInsets.java
index 2bfe3b4..9e0719d 100644
--- a/core/java/android/view/WindowInsets.java
+++ b/core/java/android/view/WindowInsets.java
@@ -316,7 +316,6 @@ public final class WindowInsets {
top ? 0 : mSystemWindowInsets.top,
right ? 0 : mSystemWindowInsets.right,
bottom ? 0 : mSystemWindowInsets.bottom);
- result.mSystemWindowInsetsConsumed = !hasSystemWindowInsets();
return result;
}
return this;
@@ -336,7 +335,6 @@ public final class WindowInsets {
int right, int bottom) {
final WindowInsets result = new WindowInsets(this);
result.mSystemWindowInsets = new Rect(left, top, right, bottom);
- result.mSystemWindowInsetsConsumed = !hasSystemWindowInsets();
return result;
}
@@ -351,7 +349,6 @@ public final class WindowInsets {
public WindowInsets replaceSystemWindowInsets(Rect systemWindowInsets) {
final WindowInsets result = new WindowInsets(this);
result.mSystemWindowInsets = new Rect(systemWindowInsets);
- result.mSystemWindowInsetsConsumed = !hasSystemWindowInsets();
return result;
}
@@ -376,7 +373,6 @@ public final class WindowInsets {
top ? 0 : mWindowDecorInsets.top,
right ? 0 : mWindowDecorInsets.right,
bottom ? 0 : mWindowDecorInsets.bottom);
- result.mWindowDecorInsetsConsumed = !hasWindowDecorInsets();
return result;
}
return this;
@@ -388,7 +384,6 @@ public final class WindowInsets {
public WindowInsets replaceWindowDecorInsets(int left, int top, int right, int bottom) {
final WindowInsets result = new WindowInsets(this);
result.mWindowDecorInsets = new Rect(left, top, right, bottom);
- result.mWindowDecorInsetsConsumed = !hasWindowDecorInsets();
return result;
}