Revert "Add isRound to WindowInsets"
This reverts commit e5244b5638535964103ca1dfc867442a64243db1.
Change-Id: I6371c718e2189968699e980fd0e7ba91c486aca6
diff --git a/api/current.txt b/api/current.txt
index 9bf7674..b163bd3 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -30958,7 +30958,6 @@
method public boolean hasInsets();
method public boolean hasSystemWindowInsets();
method public boolean hasWindowDecorInsets();
- method public boolean isRound();
}
public abstract interface WindowManager implements android.view.ViewManager {
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index eec4354..ef22def 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -1171,11 +1171,6 @@
m.preTranslate(-attachInfo.mWindowLeft, -attachInfo.mWindowTop);
}
- void dispatchApplyInsets(View host) {
- mFitSystemWindowsInsets.set(mAttachInfo.mContentInsets);
- host.dispatchApplyWindowInsets(new WindowInsets(mFitSystemWindowsInsets));
- }
-
private void performTraversals() {
// cache mView since it is used so much below...
final View host = mView;
@@ -1262,7 +1257,8 @@
}
host.dispatchAttachedToWindow(attachInfo, 0);
attachInfo.mTreeObserver.dispatchOnWindowAttachedChange(true);
- dispatchApplyInsets(host);
+ mFitSystemWindowsInsets.set(mAttachInfo.mContentInsets);
+ host.fitSystemWindows(mFitSystemWindowsInsets);
//Log.i(TAG, "Screen on initialized: " + attachInfo.mKeepScreenOn);
} else {
@@ -1387,8 +1383,9 @@
if (mFitSystemWindowsRequested) {
mFitSystemWindowsRequested = false;
+ mFitSystemWindowsInsets.set(mAttachInfo.mContentInsets);
mLastOverscanRequested = mAttachInfo.mOverscanRequested;
- dispatchApplyInsets(host);
+ host.fitSystemWindows(mFitSystemWindowsInsets);
if (mLayoutRequested) {
// Short-circuit catching a new layout request here, so
// we don't need to go through two layout passes when things
@@ -1562,7 +1559,8 @@
mLastSystemUiVisibility = mAttachInfo.mSystemUiVisibility;
mLastOverscanRequested = mAttachInfo.mOverscanRequested;
mFitSystemWindowsRequested = false;
- dispatchApplyInsets(host);
+ mFitSystemWindowsInsets.set(mAttachInfo.mContentInsets);
+ host.fitSystemWindows(mFitSystemWindowsInsets);
}
if (visibleInsetsChanged) {
mAttachInfo.mVisibleInsets.set(mPendingVisibleInsets);
diff --git a/core/java/android/view/WindowInsets.java b/core/java/android/view/WindowInsets.java
index f8cc793..cdfcb43 100644
--- a/core/java/android/view/WindowInsets.java
+++ b/core/java/android/view/WindowInsets.java
@@ -33,7 +33,6 @@
private Rect mSystemWindowInsets;
private Rect mWindowDecorInsets;
private Rect mTempRect;
- private boolean mIsRound;
private static final Rect EMPTY_RECT = new Rect(0, 0, 0, 0);
@@ -47,14 +46,8 @@
/** @hide */
public WindowInsets(Rect systemWindowInsets, Rect windowDecorInsets) {
- this(systemWindowInsets, windowDecorInsets, false);
- }
-
- /** @hide */
- public WindowInsets(Rect systemWindowInsets, Rect windowDecorInsets, boolean isRound) {
mSystemWindowInsets = systemWindowInsets;
mWindowDecorInsets = windowDecorInsets;
- mIsRound = isRound;
}
/**
@@ -65,12 +58,12 @@
public WindowInsets(WindowInsets src) {
mSystemWindowInsets = src.mSystemWindowInsets;
mWindowDecorInsets = src.mWindowDecorInsets;
- mIsRound = src.mIsRound;
}
/** @hide */
public WindowInsets(Rect systemWindowInsets) {
- this(systemWindowInsets, EMPTY_RECT);
+ mSystemWindowInsets = systemWindowInsets;
+ mWindowDecorInsets = EMPTY_RECT;
}
/**
@@ -227,20 +220,6 @@
return hasSystemWindowInsets() || hasWindowDecorInsets();
}
- /**
- * Returns true if the associated window has a round shape.
- *
- * <p>A round window's left, top, right and bottom edges reach all the way to the
- * associated edges of the window but the corners may not be visible. Views responding
- * to round insets should take care to not lay out critical elements within the corners
- * where they may not be accessible.</p>
- *
- * @return True if the window is round
- */
- public boolean isRound() {
- return mIsRound;
- }
-
public WindowInsets cloneWithSystemWindowInsetsConsumed() {
final WindowInsets result = new WindowInsets(this);
result.mSystemWindowInsets = new Rect(0, 0, 0, 0);
@@ -294,6 +273,6 @@
@Override
public String toString() {
return "WindowInsets{systemWindowInsets=" + mSystemWindowInsets + " windowDecorInsets=" +
- mWindowDecorInsets + (isRound() ? "round}" : "}");
+ mWindowDecorInsets + "}";
}
}