diff options
author | Maurice Lam <yukl@google.com> | 2017-02-13 16:23:45 -0800 |
---|---|---|
committer | Maurice Lam <yukl@google.com> | 2017-02-17 15:47:08 -0800 |
commit | 2831318df83781bb5bada256e35726612d225052 (patch) | |
tree | 297b2b22e097d36d59f585a45669b95eae9e68bb /library/self.gradle | |
parent | 74acd46e273b62bb043bd81e0db51d7b686516be (diff) | |
download | setupwizard-2831318df83781bb5bada256e35726612d225052.tar.gz |
Fix ButtonItem theme in appcompat
Inflate the button from XML rather than calling the constructor
directly, so that AppCompatActivity can use the injected layout
inflater to tint the button drawables.
- Migrated existing ButtonItemTest to robolectric
- Added new ButtonItemDrawingTest as instrumentation test to test
the drawing behavior. Created DrawingTestHelper and
DrawingTestActivity to help in testing draw behaviors in normal and
AppCompat contexts.
Bug: 35325693
Test: ./gradlew connectedAndroidTest
Change-Id: Ic2215f5510c246a861ab109e3dffee49f9cf9b3c
Diffstat (limited to 'library/self.gradle')
-rw-r--r-- | library/self.gradle | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/library/self.gradle b/library/self.gradle index c744215..e481852 100644 --- a/library/self.gradle +++ b/library/self.gradle @@ -1,11 +1,8 @@ /** * This self.gradle build file is only run when built in ub-setupwizard-* branches. */ - apply plugin: 'dist' - apply from: 'standalone-rules.gradle' - // Add targets for tests android.sourceSets { androidTest { @@ -23,6 +20,10 @@ android.sourceSets { } } + androidTestPlatform { + java.srcDirs = ['platform/test/src'] + } + androidTestGingerbreadCompat { java.srcDirs = ['full-support/test/src', 'eclair-mr1/test/src'] res.srcDirs = ['full-support/test/res'] @@ -42,7 +43,6 @@ android.sourceSets { } } android.defaultConfig.testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - android.lintOptions { abortOnError true htmlReport true @@ -51,12 +51,10 @@ android.lintOptions { warningsAsErrors true xmlReport false } - // Run lint for all variants android.libraryVariants.all { variant -> variant.assemble.dependsOn(tasks.findByName('lint')) } - // Output all test APKs to the distribution folder def distTask = tasks.findByName('dist') if (distTask) { |