diff --git a/api/current.txt b/api/current.txt index 84d7fcdec1cea..214748c67890d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -33693,6 +33693,7 @@ package android.view { method protected int computeHorizontalScrollOffset(); method protected int computeHorizontalScrollRange(); method public void computeScroll(); + method public android.view.WindowInsets computeSystemWindowInsets(android.view.WindowInsets, android.graphics.Rect); method protected int computeVerticalScrollExtent(); method protected int computeVerticalScrollOffset(); method protected int computeVerticalScrollRange(); @@ -35018,6 +35019,7 @@ package android.view { method public boolean isConsumed(); method public boolean isRound(); method public android.view.WindowInsets replaceSystemWindowInsets(int, int, int, int); + method public android.view.WindowInsets replaceSystemWindowInsets(android.graphics.Rect); } public abstract interface WindowManager implements android.view.ViewManager { diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index eb8f3bf1c0645..ac006672b74ad 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -6524,6 +6524,28 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } } + /** + * Compute insets that should be consumed by this view and the ones that should propagate + * to those under it. + * + * @param in Insets currently being processed by this View, likely received as a parameter + * to {@link #onApplyWindowInsets(WindowInsets)}. + * @param outLocalInsets A Rect that will receive the insets that should be consumed + * by this view + * @return Insets that should be passed along to views under this one + */ + public WindowInsets computeSystemWindowInsets(WindowInsets in, Rect outLocalInsets) { + if ((mViewFlags & OPTIONAL_FITS_SYSTEM_WINDOWS) == 0 + || mAttachInfo == null + || (mAttachInfo.mSystemUiVisibility & SYSTEM_UI_LAYOUT_FLAGS) == 0) { + outLocalInsets.set(in.getSystemWindowInsets()); + return in.consumeSystemWindowInsets(); + } else { + outLocalInsets.set(0, 0, 0, 0); + return in; + } + } + /** * Sets whether or not this view should account for system screen decorations * such as the status bar and inset its content; that is, controlling whether diff --git a/core/java/android/view/WindowInsets.java b/core/java/android/view/WindowInsets.java index 24c3c1a72ab06..2bfe3b42477d0 100644 --- a/core/java/android/view/WindowInsets.java +++ b/core/java/android/view/WindowInsets.java @@ -340,6 +340,21 @@ public final class WindowInsets { return result; } + /** + * Returns a copy of this WindowInsets with selected system window insets replaced + * with new values. + * + * @param systemWindowInsets New system window insets. Each field is the inset in pixels + * for that edge + * @return A modified copy of this WindowInsets + */ + public WindowInsets replaceSystemWindowInsets(Rect systemWindowInsets) { + final WindowInsets result = new WindowInsets(this); + result.mSystemWindowInsets = new Rect(systemWindowInsets); + result.mSystemWindowInsetsConsumed = !hasSystemWindowInsets(); + return result; + } + /** * @hide */