diff options
author | Maurice Lam <yukl@google.com> | 2017-12-14 20:15:14 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-12-14 20:15:14 +0000 |
commit | 37ba83338aa29464357f4a03df8c7b4038d932e7 (patch) | |
tree | b4c5050107f6658555662ddcaa68322b722fadbe /library/gingerbread | |
parent | 8f8401475a27d1a6a54ec8fbc12fea6f53a9bac7 (diff) | |
parent | 66815fe66392bcbb12e2fc93bbf326a5c2d8782f (diff) | |
download | setupwizard-37ba83338aa29464357f4a03df8c7b4038d932e7.tar.gz |
Merge "Revert "Revert "Changes needed to upgrade to new gradle version"""
Diffstat (limited to 'library/gingerbread')
4 files changed, 5 insertions, 6 deletions
diff --git a/library/gingerbread/src/com/android/setupwizardlib/view/NavigationBarButton.java b/library/gingerbread/src/com/android/setupwizardlib/view/NavigationBarButton.java index 5172c47..d7a3c2e 100644 --- a/library/gingerbread/src/com/android/setupwizardlib/view/NavigationBarButton.java +++ b/library/gingerbread/src/com/android/setupwizardlib/view/NavigationBarButton.java @@ -16,6 +16,7 @@ package com.android.setupwizardlib.view; +import android.annotation.SuppressLint; import android.content.Context; import android.content.res.ColorStateList; import android.graphics.PorterDuff; @@ -30,6 +31,7 @@ import android.widget.Button; * Button for navigation bar, which includes tinting of its compound drawables to be used for dark * and light themes. */ +@SuppressLint("AppCompatCustomView") public class NavigationBarButton extends Button { public NavigationBarButton(Context context) { diff --git a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java index 4fb3e28..3020ed3 100644 --- a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java +++ b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java @@ -32,7 +32,6 @@ import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; -import com.android.setupwizardlib.BuildConfig; import com.android.setupwizardlib.R; import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner; @@ -44,7 +43,7 @@ import org.robolectric.annotation.Config; import java.util.ArrayList; @RunWith(SuwLibRobolectricTestRunner.class) -@Config(constants = BuildConfig.class, sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK }) +@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK }) public class ExpandableSwitchItemTest { private TextView mSummaryView; diff --git a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java index d391d80..fa5bbba 100644 --- a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java +++ b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java @@ -31,7 +31,6 @@ import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; -import com.android.setupwizardlib.BuildConfig; import com.android.setupwizardlib.R; import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner; @@ -40,7 +39,7 @@ import org.junit.runner.RunWith; import org.robolectric.annotation.Config; @RunWith(SuwLibRobolectricTestRunner.class) -@Config(constants = BuildConfig.class, sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK }) +@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK }) public class SwitchItemTest { private SwitchCompat mSwitch; diff --git a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/util/DimensionConsistencyTest.java b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/util/DimensionConsistencyTest.java index 43e7f03..7a08235 100644 --- a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/util/DimensionConsistencyTest.java +++ b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/util/DimensionConsistencyTest.java @@ -25,7 +25,6 @@ import android.util.DisplayMetrics; import android.util.TypedValue; import android.view.ContextThemeWrapper; -import com.android.setupwizardlib.BuildConfig; import com.android.setupwizardlib.R; import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner; @@ -35,7 +34,7 @@ import org.junit.runner.RunWith; import org.robolectric.annotation.Config; @RunWith(SuwLibRobolectricTestRunner.class) -@Config(constants = BuildConfig.class, sdk = Config.ALL_SDKS) +@Config(sdk = Config.ALL_SDKS) public class DimensionConsistencyTest { // Visual height of the framework switch widget |