diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-03-13 09:46:54 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-03-13 09:46:54 +0000 |
| commit | e752bf84b0b946f04606740a45df63efcc7ff612 (patch) | |
| tree | fe3d3541a2bdcb7b1983600dc7595ffc2628e95f | |
| parent | 74f9db424e9ed21b6b3c5a1e8e15313a4c1c0896 (diff) | |
| parent | 15d9037e89d502c7deb9cbf81c0407d433a5706b (diff) | |
| download | setupwizard-e752bf84b0b946f04606740a45df63efcc7ff612.tar.gz | |
Snap for 4651078 from 15d9037e89d502c7deb9cbf81c0407d433a5706b to pi-release
Change-Id: I308e60ec834c0916972b0b9aa48abd23cec39c1f
| -rw-r--r-- | library/main/res/values/dimens.xml | 2 | ||||
| -rw-r--r-- | library/main/res/values/styles.xml | 4 | ||||
| -rw-r--r-- | library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java | 8 |
3 files changed, 8 insertions, 6 deletions
diff --git a/library/main/res/values/dimens.xml b/library/main/res/values/dimens.xml index 69475b2..be6b248 100644 --- a/library/main/res/values/dimens.xml +++ b/library/main/res/values/dimens.xml @@ -26,6 +26,8 @@ <!-- Calculated by (suw_glif_margin_sides - suw_glif_button_padding) --> <dimen name="suw_glif_button_margin_start">8dp</dimen> <dimen name="suw_glif_button_padding">16dp</dimen> + <!-- Negative of suw_glif_button_padding --> + <dimen name="suw_glif_negative_button_padding">-16dp</dimen> <dimen name="suw_glif_footer_padding_vertical">8dp</dimen> <dimen name="suw_glif_footer_min_height">72dp</dimen> <dimen name="suw_glif_margin_sides">24dp</dimen> diff --git a/library/main/res/values/styles.xml b/library/main/res/values/styles.xml index dbd5358..fa2a080 100644 --- a/library/main/res/values/styles.xml +++ b/library/main/res/values/styles.xml @@ -195,10 +195,10 @@ <item name="android:buttonStyle">@style/SuwGlifButton.Tertiary</item> <item name="android:theme">@style/SuwGlifButton.Tertiary</item> - <item name="android:background">@null</item> <item name="android:fontFamily" tools:targetApi="jelly_bean">sans-serif</item> <item name="android:layout_gravity">?attr/suwGlifHeaderGravity</item> - <item name="android:padding">0dp</item> + <item name="android:layout_marginLeft">@dimen/suw_glif_negative_button_padding</item> + <item name="android:layout_marginRight">@dimen/suw_glif_negative_button_padding</item> <!-- Always lowercase instead of reading attr/suwButtonAllCaps, since this is a tertiary button --> <item name="android:textAllCaps" tools:targetApi="ice_cream_sandwich">false</item> diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java index 20661ff..46df9d6 100644 --- a/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java +++ b/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java @@ -16,8 +16,9 @@ package com.android.setupwizardlib.util; +import static com.google.common.truth.Truth.assertThat; + import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.robolectric.RuntimeEnvironment.application; @@ -59,9 +60,8 @@ public class GlifStyleTest { Robolectric.buildAttributeSet() .setStyleAttribute("@style/SuwGlifButton.Tertiary") .build()); - assertNull("Background of tertiary button should be null", button.getBackground()); - assertNull("Tertiary button should have no transformation method", - button.getTransformationMethod()); + assertThat(button.getBackground()).named("background").isNotNull(); + assertThat(button.getTransformationMethod()).named("transformation method").isNull(); if (VERSION.SDK_INT < VERSION_CODES.M) { // Robolectric resolved the wrong theme attribute on versions >= M // https://github.com/robolectric/robolectric/issues/2940 |