From 001f4bcca28f321c45db0580b25ec803a72bcbcd Mon Sep 17 00:00:00 2001 From: Alex Saveau Date: Fri, 6 Jul 2018 23:41:12 -0700 Subject: [PATCH 1/2] Fix Travis build --- .travis.yml | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 72125813dd1..019643d0825 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,11 +7,6 @@ sudo: required dist: trusty env: - global: - # Notice global environment variables are available during the install phase for android > - # components. These are the only variables that can be used in that section - - SDK_API=P - - BUILD_TOOLS_VERSION=26.0.2 matrix: # Notice matrix environment variables are not available during the install phase for android > # components. @@ -33,16 +28,14 @@ cache: android: components: - - tools # to get the new `repository-11.xml` - - platform-tools #latest - - tools # to install Android SDK tools 25+, latest, cannot get more granular control than this - # See https://github.com/travis-ci/travis-ci/issues/6040#issuecomment-219367943 for more - # details. - - build-tools-$BUILD_TOOLS_VERSION - - android-$SDK_API - - licenses: - - 'android-sdk-license-.+' + # https://github.com/travis-ci/travis-ci/issues/6040#issuecomment-219367943 + - tools + - tools + +before_install: + - mkdir "$ANDROID_HOME/licenses" || true + - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55\nd56f5187479451eabf01fb78af6dfcb131a6481e" > "$ANDROID_HOME/licenses/android-sdk-license" + - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd\n504667f4c0de7af1a06de9f4b1727b84351f2910" > "$ANDROID_HOME/licenses/android-sdk-preview-license" before_script: - ./travis_before_script.sh From 889cdeb1553d096b1bbd7280ca248c24aa7a8f48 Mon Sep 17 00:00:00 2001 From: Alex Saveau Date: Fri, 6 Jul 2018 23:56:26 -0700 Subject: [PATCH 2/2] Fix lint --- lib/java/com/google/android/material/chip/Chip.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/java/com/google/android/material/chip/Chip.java b/lib/java/com/google/android/material/chip/Chip.java index 9294d7bf1b8..184cf0dc645 100644 --- a/lib/java/com/google/android/material/chip/Chip.java +++ b/lib/java/com/google/android/material/chip/Chip.java @@ -228,7 +228,7 @@ && isChecked())) { + chipDrawable.getCloseIconSize(); } - if (getPaddingEnd() != paddingEnd) { + if (ViewCompat.getPaddingEnd(this) != paddingEnd) { ViewCompat.setPaddingRelative( this, ViewCompat.getPaddingStart(this),