Snap for 4784261 from a65273f3bd to pi-release

Change-Id: Ifd614b494a473c2aaa886b1e430d91684b91e6b6
This commit is contained in:
android-build-team Robot 2018-05-16 07:21:58 +00:00
commit 30edb6eff7
2 changed files with 14 additions and 0 deletions

View file

@ -20,6 +20,7 @@
style="@style/SuwItemContainer.Verbose"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:orientation="horizontal">
<FrameLayout

View file

@ -16,12 +16,15 @@
package com.android.setupwizardlib.items;
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.robolectric.RuntimeEnvironment.application;
import android.annotation.TargetApi;
import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES;
import android.support.v7.widget.SwitchCompat;
import android.view.LayoutInflater;
@ -34,6 +37,7 @@ import android.widget.TextView;
import com.android.setupwizardlib.R;
import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.annotation.Config;
@ -44,6 +48,15 @@ public class SwitchItemTest {
private SwitchCompat mSwitch;
@Test
public void testLayout() {
Assume.assumeTrue(VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP);
SwitchItem item = new SwitchItem();
LayoutInflater inflater = LayoutInflater.from(application);
ViewGroup layout = (ViewGroup) inflater.inflate(item.getDefaultLayoutResource(), null);
assertThat(layout.getClipToPadding()).isFalse();
}
@Test
public void testChecked() {
SwitchItem item = new SwitchItem();