DEV/material-components_material-components-android
1
0
Fork 0
mirror of https://github.com/material-components/material-components-android.git synced 2026-02-20 08:39:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix CoordinatorLayout IllegalArgumentException crash" into nyc-mr1-dev

Browse Source 
GitOrigin-RevId=76f4c18e25fdad211d81463dd9fb4586d7cc66a0

PiperOrigin-RevId: 140564755
This commit is contained in:
Alan Viverette 2016-11-30 05:14:10 +00:00 committed by Travis Collins
parent dce3b40813
commit 94e2756ddc
2 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/android/support/design/widget/CoordinatorLayout.java
View File

@ -1309,6 +1309,12 @@ public class CoordinatorLayout extends ViewGroup implements NestedScrollingParen
}
private void offsetChildByInset(final View child, final Rect inset, final int layoutDirection) {
if (!ViewCompat.isLaidOut(child)) {
// The view has not been laid out yet,
// so we can't obtain its bounds.
return;
}
final LayoutParams lp = (LayoutParams) child.getLayoutParams();
final int absDodgeInsetEdges = GravityCompat.getAbsoluteGravity(lp.dodgeInsetEdges,
layoutDirection);

58
tests/src/android/support/design/widget/CoordinatorLayoutTest.java
View File

@ -31,7 +31,9 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import android.app.Instrumentation;
import android.graphics.Rect;
import android.support.design.testutils.CoordinatorLayoutUtils;
import android.support.design.widget.CoordinatorLayout.Behavior;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SdkSuppress;
import android.support.v4.view.ViewCompat;
@ -39,7 +41,9 @@ import android.support.v4.view.WindowInsetsCompat;
import android.test.suitebuilder.annotation.MediumTest;
import android.view.Gravity;
import android.view.View;
import android.view.View.MeasureSpec;
import org.junit.Before;
import org.junit.Test;
import java.util.List;
@ -48,10 +52,17 @@ import java.util.concurrent.atomic.AtomicInteger;
@MediumTest
public class CoordinatorLayoutTest extends BaseInstrumentationTestCase<CoordinatorLayoutActivity> {
private Instrumentation mInstrumentation;
public CoordinatorLayoutTest() {
super(CoordinatorLayoutActivity.class);
}
@Before
public void setup() {
mInstrumentation = InstrumentationRegistry.getInstrumentation();
}
@Test
@SdkSuppress(minSdkVersion = 21)
public void testSetFitSystemWindows() {
@ -334,4 +345,51 @@ public class CoordinatorLayoutTest extends BaseInstrumentationTestCase<Coordinat
});
}
@Test
public void testDodgeInsetBeforeLayout() throws Throwable {
final CoordinatorLayout col = mActivityTestRule.getActivity().mCoordinatorLayout;
// Add a dummy view, which will be used to trigger a hierarchy change.
final View dummy = new View(col.getContext());
mActivityTestRule.runOnUiThread(new Runnable() {
@Override
public void run() {
col.addView(dummy);
}
});
// Wait for a layout.
mInstrumentation.waitForIdleSync();
final View dodge = new View(col.getContext());
final CoordinatorLayout.LayoutParams lpDodge = col.generateDefaultLayoutParams();
lpDodge.dodgeInsetEdges = Gravity.BOTTOM;
lpDodge.setBehavior(new Behavior() {
@Override
public boolean getInsetDodgeRect(CoordinatorLayout parent, View child, Rect rect) {
// Any non-empty rect is fine here.
rect.set(0, 0, 10, 10);
return true;
}
});
mActivityTestRule.runOnUiThread(new Runnable() {
@Override
public void run() {
col.addView(dodge, lpDodge);
// Ensure the new view is in the list of children.
int heightSpec = MeasureSpec.makeMeasureSpec(col.getHeight(), MeasureSpec.EXACTLY);
int widthSpec = MeasureSpec.makeMeasureSpec(col.getWidth(), MeasureSpec.EXACTLY);
col.measure(widthSpec, heightSpec);
// Force a hierarchy change.
col.removeView(dummy);
}
});
// Wait for a layout.
mInstrumentation.waitForIdleSync();
}
}