Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 8 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/java/com/google/android/material/chip/Chip.java
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ && isChecked())) {
+ chipDrawable.getCloseIconSize();
}

if (getPaddingEnd() != paddingEnd) {
if (ViewCompat.getPaddingEnd(this) != paddingEnd) {
ViewCompat.setPaddingRelative(
this,
ViewCompat.getPaddingStart(this),
Expand Down