From 0df00a27577722c4a84815029274ae384b4403ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ang=C3=A9lica=20Oliveira?= Date: Fri, 22 Nov 2019 18:27:25 -0300 Subject: [PATCH 01/30] Init of screenshot tests --- app/src/main/AndroidManifest.xml | 1 + build.gradle | 3 ++- system/build.gradle | 3 ++- system/src/androidTest/AndroidManifest.xml | 6 ++++++ .../com/selem/system/ExampleInstrumentedTest.kt | 15 +++++++++++++-- .../com/selem/system/ScreenShotTestRunner.kt | 17 +++++++++++++++++ system/src/main/AndroidManifest.xml | 8 +++++++- .../src/main/java/com/selem/system/GreenView.kt | 16 ++++++++++++++++ 8 files changed, 64 insertions(+), 5 deletions(-) create mode 100644 system/src/androidTest/AndroidManifest.xml create mode 100644 system/src/androidTest/java/com/selem/system/ScreenShotTestRunner.kt create mode 100644 system/src/main/java/com/selem/system/GreenView.kt diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ea0b327..6bd38c3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,6 +2,7 @@ + + + + + diff --git a/system/src/androidTest/java/com/selem/system/ExampleInstrumentedTest.kt b/system/src/androidTest/java/com/selem/system/ExampleInstrumentedTest.kt index b23d04c..2168947 100644 --- a/system/src/androidTest/java/com/selem/system/ExampleInstrumentedTest.kt +++ b/system/src/androidTest/java/com/selem/system/ExampleInstrumentedTest.kt @@ -2,6 +2,8 @@ package com.selem.system import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry +import com.facebook.testing.screenshot.Screenshot +import com.facebook.testing.screenshot.ViewHelpers import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith @@ -14,9 +16,18 @@ import org.junit.runner.RunWith @RunWith(AndroidJUnit4::class) class ExampleInstrumentedTest { @Test - fun useAppContext() { + fun greenView_checkDefaultState() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.selem.system.test", appContext.packageName) +// assertEquals("com.selem.system.test", appContext.packageName) + + val greenView = GreenView(appContext) + + ViewHelpers.setupView(greenView) + .setExactWidthDp(300) + .setExactHeightDp(100) + .layout() + + Screenshot.snap(greenView).record() } } diff --git a/system/src/androidTest/java/com/selem/system/ScreenShotTestRunner.kt b/system/src/androidTest/java/com/selem/system/ScreenShotTestRunner.kt new file mode 100644 index 0000000..71beebe --- /dev/null +++ b/system/src/androidTest/java/com/selem/system/ScreenShotTestRunner.kt @@ -0,0 +1,17 @@ +package com.selem.system + +import android.os.Bundle +import androidx.test.runner.AndroidJUnitRunner +import com.facebook.testing.screenshot.ScreenshotRunner + +class ScreenShotTestRunner : AndroidJUnitRunner() { + override fun onCreate(arguments: Bundle?) { + super.onCreate(arguments) + ScreenshotRunner.onCreate(this, arguments) + } + + override fun finish(resultCode: Int, results: Bundle?) { + ScreenshotRunner.onDestroy() + super.finish(resultCode, results) + } +} \ No newline at end of file diff --git a/system/src/main/AndroidManifest.xml b/system/src/main/AndroidManifest.xml index 7facffd..c5ced5b 100644 --- a/system/src/main/AndroidManifest.xml +++ b/system/src/main/AndroidManifest.xml @@ -1 +1,7 @@ - + + + + + + diff --git a/system/src/main/java/com/selem/system/GreenView.kt b/system/src/main/java/com/selem/system/GreenView.kt new file mode 100644 index 0000000..4cc7642 --- /dev/null +++ b/system/src/main/java/com/selem/system/GreenView.kt @@ -0,0 +1,16 @@ +package com.selem.system + +import android.content.Context +import android.graphics.drawable.ColorDrawable +import android.util.AttributeSet +import android.view.View +import androidx.core.content.ContextCompat + + +class GreenView @JvmOverloads constructor(context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0): View(context, attrs, defStyleAttr) { + init { + background = ColorDrawable(ContextCompat.getColor(context, android.R.color.holo_green_light)) + } +} \ No newline at end of file From fbecae178e9fb60e3bf1bd0663627ca835b739f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ang=C3=A9lica=20Oliveira?= Date: Mon, 25 Nov 2019 11:43:48 -0300 Subject: [PATCH 02/30] fix screenshot tests --- app/src/main/AndroidManifest.xml | 1 - build.gradle | 2 +- system/src/androidTest/AndroidManifest.xml | 6 ++++-- system/src/main/AndroidManifest.xml | 8 +++----- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6bd38c3..ea0b327 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,7 +2,6 @@ - - + + diff --git a/system/src/main/AndroidManifest.xml b/system/src/main/AndroidManifest.xml index c5ced5b..5e92643 100644 --- a/system/src/main/AndroidManifest.xml +++ b/system/src/main/AndroidManifest.xml @@ -1,7 +1,5 @@ - - - - + From 7d7a6866e64e1f53a31eaacdb91e735669a5facc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ang=C3=A9lica=20Oliveira?= Date: Mon, 25 Nov 2019 11:45:34 -0300 Subject: [PATCH 03/30] adding screenshot folder --- ...trumentedTest_greenView_checkDefaultState.png | Bin 0 -> 1569 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 system/screenshots/com.selem.system.ExampleInstrumentedTest_greenView_checkDefaultState.png diff --git a/system/screenshots/com.selem.system.ExampleInstrumentedTest_greenView_checkDefaultState.png b/system/screenshots/com.selem.system.ExampleInstrumentedTest_greenView_checkDefaultState.png new file mode 100644 index 0000000000000000000000000000000000000000..70b09e0569f436980defa3c25f1b5f8c3c034090 GIT binary patch literal 1569 zcmeAS@N?(olHy`uVBq!ia0y~yV76pnU=-$H1B!_5I+4J@!1}_|#WAE}&fDvbyayB* z4mixHXRbITZ0zWC>5k@$?Zs~kfodI&e76GXc%U|!nSo)+3>gLng`-b^0-9><3=AHI zKrPBJnu1o`kWFic1)Vqj Date: Mon, 25 Nov 2019 11:46:00 -0300 Subject: [PATCH 04/30] changing ci script --- .travis.yml | 1 + scripts/build_publish.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 406c8de..510d351 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ env: - ANDROID_API=29 - ANDROID_BUILD_TOOLS=29.0.2 - ADB_INSTALL_TIMEOUT=5 + - EMULATOR_API_LEVEL=29 android: components: diff --git a/scripts/build_publish.sh b/scripts/build_publish.sh index a396310..13f3574 100644 --- a/scripts/build_publish.sh +++ b/scripts/build_publish.sh @@ -8,6 +8,6 @@ if [ $TRAVIS_BRANCH = "master" -a $TRAVIS_PULL_REQUEST = "false" ]; then echo "We're on the master branch." else echo "We're not on the master branch." - ./gradlew clean build -PdisablePreDex --stacktrace + ./gradlew clean build :system:verifyDebugAndroidTestScreenshotTest -PdisablePreDex --stacktrace fi From 6da41652107c16f4c4a42a944aae2ca6163042b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ang=C3=A9lica=20Oliveira?= Date: Mon, 25 Nov 2019 12:04:19 -0300 Subject: [PATCH 05/30] adding android emulator --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 510d351..6b18901 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,6 +31,10 @@ before_install: before_script: - git lfs pull + - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a -c 100M + - emulator -avd test -no-audio -no-window & + - android-wait-for-emulator + - adb shell input keyevent 82 & script: - ./scripts/build_publish.sh From 7a8b9601e7ca1b5cc9840c9672ca7cdc689cfe77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ang=C3=A9lica=20Oliveira?= Date: Mon, 25 Nov 2019 13:20:44 -0300 Subject: [PATCH 06/30] changing android version target --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6b18901..85e1aca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ before_install: before_script: - git lfs pull - - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a -c 100M + - echo no | android create avd --force -n test -t android-29 --abi armeabi-v7a -c 100M - emulator -avd test -no-audio -no-window & - android-wait-for-emulator - adb shell input keyevent 82 & From 39cf1327bb9c3eb30dc7c9d48bcce71f766ec35d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ang=C3=A9lica=20Oliveira?= Date: Mon, 25 Nov 2019 13:36:10 -0300 Subject: [PATCH 07/30] fix build ci --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 85e1aca..2cc689e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ env: - ANDROID_API=29 - ANDROID_BUILD_TOOLS=29.0.2 - ADB_INSTALL_TIMEOUT=5 - - EMULATOR_API_LEVEL=29 + - EMULATOR_API_LEVEL=26 android: components: @@ -16,8 +16,7 @@ android: - android-$EMULATOR_API_LEVEL - extra-google-m2repository - extra-android-m2repository - - sys-img-armeabi-v7a-addon-google_apis-google-$ANDROID_API_LEVEL - - sys-img-armeabi-v7a-addon-google_apis-google-$EMULATOR_API_LEVEL + - sys-img-armeabi-v7a-android-$EMULATOR_API_LEVEL licenses: - android-sdk-preview-license-.+ @@ -31,7 +30,7 @@ before_install: before_script: - git lfs pull - - echo no | android create avd --force -n test -t android-29 --abi armeabi-v7a -c 100M + - echo no | android create avd --force -n test -t android-26 --abi armeabi-v7a -c 100M - emulator -avd test -no-audio -no-window & - android-wait-for-emulator - adb shell input keyevent 82 & From 5ae01da24848fc8b6efc0a5de81926fb5faaa4d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ang=C3=A9lica=20Oliveira?= Date: Mon, 25 Nov 2019 13:42:58 -0300 Subject: [PATCH 08/30] adding dependencies --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2cc689e..071a31b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ jdk: oraclejdk8 env: global: - ANDROID_API=29 - - ANDROID_BUILD_TOOLS=29.0.2 + - ANDROID_BUILD_TOOLS=26.0.2 - ADB_INSTALL_TIMEOUT=5 - EMULATOR_API_LEVEL=26 @@ -14,6 +14,7 @@ android: - build-tools-$ANDROID_BUILD_TOOLS - android-$ANDROID_API - android-$EMULATOR_API_LEVEL + - extra-google-google_play_services - extra-google-m2repository - extra-android-m2repository - sys-img-armeabi-v7a-android-$EMULATOR_API_LEVEL From 0fa86c01693ec42cc1de7bce8b126e775edf34f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ang=C3=A9lica=20Oliveira?= Date: Mon, 25 Nov 2019 14:11:55 -0300 Subject: [PATCH 09/30] changing ci android test run --- .travis.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 071a31b..760ee98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,13 @@ env: - ANDROID_API=29 - ANDROID_BUILD_TOOLS=26.0.2 - ADB_INSTALL_TIMEOUT=5 - - EMULATOR_API_LEVEL=26 + - EMULATOR_API_LEVEL=29 + - ABI=x86_64 + - EMU_FLAVOR=default + - EMU_CHANNEL="" + - ANDROID_HOME=${HOME}/android-sdk + - TOOLS=${ANDROID_HOME}/tools + - PATH=${ANDROID_HOME}:${ANDROID_HOME}/emulator:${TOOLS}:${TOOLS}/bin:${ANDROID_HOME}/platform-tools:${PATH} android: components: @@ -31,7 +37,12 @@ before_install: before_script: - git lfs pull - - echo no | android create avd --force -n test -t android-26 --abi armeabi-v7a -c 100M + # Download required emulator tools + - echo y | sdkmanager --no_https "platforms;android-$EMULATOR_API_LEVEL" >/dev/null # We need the API of the emulator we will run + - echo y | sdkmanager --no_https $EMU_CHANNEL "emulator" >/dev/null + - echo y | sdkmanager --no_https "system-images;android-$EMULATOR_API_LEVEL;$EMU_FLAVOR;$ABI" >/dev/null # install our emulator + #- echo no | android create avd --force -n test -t android-26 --abi armeabi-v7a -c 100M + - echo no | avdmanager create avd --force -n test -k "system-images;android-$EMULATOR_API_LEVEL;$EMU_FLAVOR;$ABI" -c 10M - emulator -avd test -no-audio -no-window & - android-wait-for-emulator - adb shell input keyevent 82 & From fbba1e83c0884f2e3df6a6f9d6f7df9bfd6002ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ang=C3=A9lica=20Oliveira?= Date: Mon, 25 Nov 2019 14:40:41 -0300 Subject: [PATCH 10/30] changing ci android test run --- .travis.yml | 71 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 65 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 760ee98..dec98e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,16 +34,75 @@ before_install: - chmod +x scripts/build_publish.sh - chmod +x scripts/build_compile.sh - ./gradlew dependencies || true + # Set up Android SDK + - wget -q "https://dl.google.com/android/repository/sdk-tools-linux-$ANDROID_TOOLS.zip" -O android-sdk-tools.zip + - unzip -q android-sdk-tools.zip -d ${ANDROID_HOME} + - rm android-sdk-tools.zip + # Avoid harmless sdkmanager warning + - mkdir ~/.android + - echo 'count=0' > ~/.android/repositories.cfg + + # Accept licenses before installing components, no need to echo y for each component + - yes | sdkmanager --licenses >/dev/null + +install: + # Download SDK tools + - sdkmanager "platform-tools" >/dev/null + - sdkmanager "tools" >/dev/null # A second time per Travis docs, gets latest versions + - sdkmanager "build-tools;28.0.3" >/dev/null # Implicit gradle dependency - gradle drives changes + - sdkmanager "platforms;android-$EMULATOR_API_LEVEL" >/dev/null # We need the API of the emulator we will run + - sdkmanager "platforms;android-28" >/dev/null # We need the API of the current compileSdkVersion from gradle.properties - + + - sdkmanager "emulator" >/dev/null + - | + if [[ $ABI =~ "arm" ]]; then + # Download a pinned version of the emulator since default version can cause issues + ${ANDROID_HOME}/emulator/emulator -version + emulator_version=5264690 # 29.2.1.0 (build_id 5889189) ==> 28.0.23.0 (build_id 5264690) + # sudo apt-get install -y libunwind8 libc++1 + curl -fo emulator.zip "https://dl.google.com/android/repository/emulator-linux-$emulator_version.zip" + rm -rf "${ANDROID_HOME}/emulator" + unzip -q emulator.zip -d "${ANDROID_HOME}" + rm -f emulator.zip + # install build tools and platforms for arm (to allow emulator to run) + sdkmanager "build-tools;25.0.2" "platforms;android-25" > /dev/null + fi + - ${ANDROID_HOME}/emulator/emulator -version + + - sdkmanager "extras;android;m2repository" >/dev/null + - sdkmanager "system-images;android-$EMULATOR_API_LEVEL;$EMU_FLAVOR;$ABI" >/dev/null # install system images for emulator + + # Create an Android emulator + # - echo no | avdmanager --verbose create avd --force -n test -k "system-images;android-$EMULATOR_API_LEVEL;$EMU_FLAVOR;$ABI" -c 10M + - echo no | avdmanager --verbose create avd --force -n test -k "system-images;android-$EMULATOR_API_LEVEL;$EMU_FLAVOR;$ABI" + - EMU_PARAMS=" + -avd test + -verbose + -no-window + -no-audio + " + - EMU_COMMAND="emulator" + - | + if [[ $ABI =~ "x86" ]]; then + EMU_COMMAND="emulator-headless" + else + # emulate graphics if running on ARM + EMU_PARAMS="${EMU_PARAMS} -gpu swiftshader" + fi + # This double "sudo" monstrosity is used to have Travis execute the + # emulator with its new group permissions and help preserve the rule + # of least privilege. + - sudo -E sudo -u $USER -E bash -c "${ANDROID_HOME}/emulator/${EMU_COMMAND} ${EMU_PARAMS} &" before_script: - git lfs pull # Download required emulator tools - - echo y | sdkmanager --no_https "platforms;android-$EMULATOR_API_LEVEL" >/dev/null # We need the API of the emulator we will run - - echo y | sdkmanager --no_https $EMU_CHANNEL "emulator" >/dev/null - - echo y | sdkmanager --no_https "system-images;android-$EMULATOR_API_LEVEL;$EMU_FLAVOR;$ABI" >/dev/null # install our emulator - #- echo no | android create avd --force -n test -t android-26 --abi armeabi-v7a -c 100M - - echo no | avdmanager create avd --force -n test -k "system-images;android-$EMULATOR_API_LEVEL;$EMU_FLAVOR;$ABI" -c 10M - - emulator -avd test -no-audio -no-window & +# - echo y | sdkmanager --no_https "platforms;android-$EMULATOR_API_LEVEL" >/dev/null # We need the API of the emulator we will run +# - echo y | sdkmanager --no_https $EMU_CHANNEL "emulator" >/dev/null +# - echo y | sdkmanager --no_https "system-images;android-$EMULATOR_API_LEVEL;$EMU_FLAVOR;$ABI" >/dev/null # install our emulator +# #- echo no | android create avd --force -n test -t android-26 --abi armeabi-v7a -c 100M +# - echo no | avdmanager create avd --force -n test -k "system-images;android-$EMULATOR_API_LEVEL;$EMU_FLAVOR;$ABI" -c 10M +# - emulator -avd test -no-audio -no-window & - android-wait-for-emulator - adb shell input keyevent 82 & From 30d54b0f2be7a1988851fe93543b4557ddec4e0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ang=C3=A9lica=20Oliveira?= Date: Mon, 25 Nov 2019 15:05:12 -0300 Subject: [PATCH 11/30] fix travis --- .travis.yml | 78 +++-------------------------------------------------- 1 file changed, 4 insertions(+), 74 deletions(-) diff --git a/.travis.yml b/.travis.yml index dec98e2..e1da702 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,13 +5,7 @@ env: - ANDROID_API=29 - ANDROID_BUILD_TOOLS=26.0.2 - ADB_INSTALL_TIMEOUT=5 - - EMULATOR_API_LEVEL=29 - - ABI=x86_64 - - EMU_FLAVOR=default - - EMU_CHANNEL="" - - ANDROID_HOME=${HOME}/android-sdk - - TOOLS=${ANDROID_HOME}/tools - - PATH=${ANDROID_HOME}:${ANDROID_HOME}/emulator:${TOOLS}:${TOOLS}/bin:${ANDROID_HOME}/platform-tools:${PATH} + - EMULATOR_API_LEVEL=28 android: components: @@ -23,7 +17,7 @@ android: - extra-google-google_play_services - extra-google-m2repository - extra-android-m2repository - - sys-img-armeabi-v7a-android-$EMULATOR_API_LEVEL + - sys-img-x86-android-$EMULATOR_API_LEVEL licenses: - android-sdk-preview-license-.+ @@ -34,75 +28,11 @@ before_install: - chmod +x scripts/build_publish.sh - chmod +x scripts/build_compile.sh - ./gradlew dependencies || true - # Set up Android SDK - - wget -q "https://dl.google.com/android/repository/sdk-tools-linux-$ANDROID_TOOLS.zip" -O android-sdk-tools.zip - - unzip -q android-sdk-tools.zip -d ${ANDROID_HOME} - - rm android-sdk-tools.zip - # Avoid harmless sdkmanager warning - - mkdir ~/.android - - echo 'count=0' > ~/.android/repositories.cfg - - # Accept licenses before installing components, no need to echo y for each component - - yes | sdkmanager --licenses >/dev/null - -install: - # Download SDK tools - - sdkmanager "platform-tools" >/dev/null - - sdkmanager "tools" >/dev/null # A second time per Travis docs, gets latest versions - - sdkmanager "build-tools;28.0.3" >/dev/null # Implicit gradle dependency - gradle drives changes - - sdkmanager "platforms;android-$EMULATOR_API_LEVEL" >/dev/null # We need the API of the emulator we will run - - sdkmanager "platforms;android-28" >/dev/null # We need the API of the current compileSdkVersion from gradle.properties - - - - sdkmanager "emulator" >/dev/null - - | - if [[ $ABI =~ "arm" ]]; then - # Download a pinned version of the emulator since default version can cause issues - ${ANDROID_HOME}/emulator/emulator -version - emulator_version=5264690 # 29.2.1.0 (build_id 5889189) ==> 28.0.23.0 (build_id 5264690) - # sudo apt-get install -y libunwind8 libc++1 - curl -fo emulator.zip "https://dl.google.com/android/repository/emulator-linux-$emulator_version.zip" - rm -rf "${ANDROID_HOME}/emulator" - unzip -q emulator.zip -d "${ANDROID_HOME}" - rm -f emulator.zip - # install build tools and platforms for arm (to allow emulator to run) - sdkmanager "build-tools;25.0.2" "platforms;android-25" > /dev/null - fi - - ${ANDROID_HOME}/emulator/emulator -version - - - sdkmanager "extras;android;m2repository" >/dev/null - - sdkmanager "system-images;android-$EMULATOR_API_LEVEL;$EMU_FLAVOR;$ABI" >/dev/null # install system images for emulator - - # Create an Android emulator - # - echo no | avdmanager --verbose create avd --force -n test -k "system-images;android-$EMULATOR_API_LEVEL;$EMU_FLAVOR;$ABI" -c 10M - - echo no | avdmanager --verbose create avd --force -n test -k "system-images;android-$EMULATOR_API_LEVEL;$EMU_FLAVOR;$ABI" - - EMU_PARAMS=" - -avd test - -verbose - -no-window - -no-audio - " - - EMU_COMMAND="emulator" - - | - if [[ $ABI =~ "x86" ]]; then - EMU_COMMAND="emulator-headless" - else - # emulate graphics if running on ARM - EMU_PARAMS="${EMU_PARAMS} -gpu swiftshader" - fi - # This double "sudo" monstrosity is used to have Travis execute the - # emulator with its new group permissions and help preserve the rule - # of least privilege. - - sudo -E sudo -u $USER -E bash -c "${ANDROID_HOME}/emulator/${EMU_COMMAND} ${EMU_PARAMS} &" before_script: - git lfs pull - # Download required emulator tools -# - echo y | sdkmanager --no_https "platforms;android-$EMULATOR_API_LEVEL" >/dev/null # We need the API of the emulator we will run -# - echo y | sdkmanager --no_https $EMU_CHANNEL "emulator" >/dev/null -# - echo y | sdkmanager --no_https "system-images;android-$EMULATOR_API_LEVEL;$EMU_FLAVOR;$ABI" >/dev/null # install our emulator -# #- echo no | android create avd --force -n test -t android-26 --abi armeabi-v7a -c 100M -# - echo no | avdmanager create avd --force -n test -k "system-images;android-$EMULATOR_API_LEVEL;$EMU_FLAVOR;$ABI" -c 10M -# - emulator -avd test -no-audio -no-window & + - echo no | android create avd --force -n test -t android-28 --abi x86 -c 100M + - emulator -avd test -no-audio -no-window & - android-wait-for-emulator - adb shell input keyevent 82 & From 79f9b24fa871f27f1178c8f7cbccb579e643c7cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ang=C3=A9lica=20Oliveira?= Date: Mon, 25 Nov 2019 15:16:24 -0300 Subject: [PATCH 12/30] Fixing android emulator version --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e1da702..f573def 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ env: - ANDROID_API=29 - ANDROID_BUILD_TOOLS=26.0.2 - ADB_INSTALL_TIMEOUT=5 - - EMULATOR_API_LEVEL=28 + - EMULATOR_API_LEVEL=27 android: components: @@ -31,7 +31,7 @@ before_install: before_script: - git lfs pull - - echo no | android create avd --force -n test -t android-28 --abi x86 -c 100M + - echo no | android create avd --force -n test -t android-$EMULATOR_API_LEVEL --abi x86 -c 100M - emulator -avd test -no-audio -no-window & - android-wait-for-emulator - adb shell input keyevent 82 & From 7a49ceed9b873df08441967f828e7a51f6f7f2b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ang=C3=A9lica=20Oliveira?= Date: Mon, 25 Nov 2019 15:39:59 -0300 Subject: [PATCH 13/30] addding log --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index f573def..066b564 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,6 +31,7 @@ before_install: before_script: - git lfs pull + - find ~/Library/Android/sdk/system-images/android-27/ -type f - echo no | android create avd --force -n test -t android-$EMULATOR_API_LEVEL --abi x86 -c 100M - emulator -avd test -no-audio -no-window & - android-wait-for-emulator From 5b6e790396c367d12a4377af6125b0ac3f685acc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ang=C3=A9lica=20Oliveira?= Date: Mon, 25 Nov 2019 16:00:24 -0300 Subject: [PATCH 14/30] addding log --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 066b564..b9f5542 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ before_install: before_script: - git lfs pull - - find ~/Library/Android/sdk/system-images/android-27/ -type f + - find ~/Library/Android/sdk/system-images -type f - echo no | android create avd --force -n test -t android-$EMULATOR_API_LEVEL --abi x86 -c 100M - emulator -avd test -no-audio -no-window & - android-wait-for-emulator From 7f6a87ba90aa5acb71b392b0732066ef4888a022 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ang=C3=A9lica=20Oliveira?= Date: Mon, 25 Nov 2019 16:07:48 -0300 Subject: [PATCH 15/30] addding log --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b9f5542..2c1803f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ before_install: before_script: - git lfs pull - - find ~/Library/Android/sdk/system-images -type f + - find $HOME/android/sdk/system-images -type f - echo no | android create avd --force -n test -t android-$EMULATOR_API_LEVEL --abi x86 -c 100M - emulator -avd test -no-audio -no-window & - android-wait-for-emulator From 9518577d653f3c2e2cb062cf54c1addc956622b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ang=C3=A9lica=20Oliveira?= Date: Mon, 25 Nov 2019 16:25:20 -0300 Subject: [PATCH 16/30] addding log --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2c1803f..155c0b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ before_install: before_script: - git lfs pull - - find $HOME/android/sdk/system-images -type f + - find ${HOME}/android-sdk/system-images -type f - echo no | android create avd --force -n test -t android-$EMULATOR_API_LEVEL --abi x86 -c 100M - emulator -avd test -no-audio -no-window & - android-wait-for-emulator From b91e9ffc15ac18a39969a25f8740e069ecdfce45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ang=C3=A9lica=20Oliveira?= Date: Mon, 25 Nov 2019 16:31:42 -0300 Subject: [PATCH 17/30] addding log --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 155c0b5..cedb09f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ before_install: before_script: - git lfs pull - - find ${HOME}/android-sdk/system-images -type f + - find /usr/local/android-sdk/system-images -type f - echo no | android create avd --force -n test -t android-$EMULATOR_API_LEVEL --abi x86 -c 100M - emulator -avd test -no-audio -no-window & - android-wait-for-emulator From 7301fc9c077aac2ef38401c2f2a66829afa4fbcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ang=C3=A9lica=20Oliveira?= Date: Mon, 25 Nov 2019 16:45:25 -0300 Subject: [PATCH 18/30] fixing ci --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cedb09f..a92b704 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,8 @@ env: - ANDROID_BUILD_TOOLS=26.0.2 - ADB_INSTALL_TIMEOUT=5 - EMULATOR_API_LEVEL=27 + - SYSTEM_IMAGE=/usr/local/android-sdk/system-images/android-27/default/x86/kernel-ranchu-64 + - ANDROID_SDK_ROOT=/usr/local/android-sdk android: components: @@ -27,12 +29,14 @@ before_install: - chmod +x gradlew - chmod +x scripts/build_publish.sh - chmod +x scripts/build_compile.sh + - yes | sdkmanager --sdk_root=$ANDROID_SDK_ROOT "tools" "build-tools;26.0.2" "extras;android;m2repository" + - export PATH=${ANDROID_SDK_ROOT}/tools/bin:$PATH - ./gradlew dependencies || true before_script: - git lfs pull - find /usr/local/android-sdk/system-images -type f - - echo no | android create avd --force -n test -t android-$EMULATOR_API_LEVEL --abi x86 -c 100M + - echo no | android create avd --force -n test -t android-$EMULATOR_API_LEVEL --abi x86 -c 100M -kernel $SYSTEM_IMAGE - emulator -avd test -no-audio -no-window & - android-wait-for-emulator - adb shell input keyevent 82 & From 059bd3844ca3b740f18265ff9b716a9c30d22103 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ang=C3=A9lica=20Oliveira?= Date: Mon, 25 Nov 2019 16:55:46 -0300 Subject: [PATCH 19/30] fixing ci --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a92b704..54486e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,8 +36,8 @@ before_install: before_script: - git lfs pull - find /usr/local/android-sdk/system-images -type f - - echo no | android create avd --force -n test -t android-$EMULATOR_API_LEVEL --abi x86 -c 100M -kernel $SYSTEM_IMAGE - - emulator -avd test -no-audio -no-window & + - echo no | android create avd --force -n test -t android-$EMULATOR_API_LEVEL --abi x86 -c 100M + - emulator -avd test -kernel $SYSTEM_IMAGE -no-audio -no-window & - android-wait-for-emulator - adb shell input keyevent 82 & From 3434cb993f81ac8b31840b4b86f5455af0332f2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ang=C3=A9lica=20Oliveira?= Date: Mon, 25 Nov 2019 17:06:06 -0300 Subject: [PATCH 20/30] fixing ci --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 54486e2..0473e13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ before_install: before_script: - git lfs pull - find /usr/local/android-sdk/system-images -type f - - echo no | android create avd --force -n test -t android-$EMULATOR_API_LEVEL --abi x86 -c 100M + - echo no | android create avd --force -n test --tag android-$EMULATOR_API_LEVEL --abi x86 -c 100M - emulator -avd test -kernel $SYSTEM_IMAGE -no-audio -no-window & - android-wait-for-emulator - adb shell input keyevent 82 & From 324b89212e47e3631f62d82e557127097a7e559e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ang=C3=A9lica=20Oliveira?= Date: Mon, 25 Nov 2019 17:14:52 -0300 Subject: [PATCH 21/30] fixing ci --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0473e13..0779abf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ before_install: before_script: - git lfs pull - find /usr/local/android-sdk/system-images -type f - - echo no | android create avd --force -n test --tag android-$EMULATOR_API_LEVEL --abi x86 -c 100M + - echo no | android create avd --force -n test -k "system-images;android-$EMULATOR_API_LEVEL;default;x86" -c 100M - emulator -avd test -kernel $SYSTEM_IMAGE -no-audio -no-window & - android-wait-for-emulator - adb shell input keyevent 82 & From cdd33fe61d19f0536819017e576aef22f44c139c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ang=C3=A9lica=20Oliveira?= Date: Mon, 25 Nov 2019 17:28:01 -0300 Subject: [PATCH 22/30] fixing ci --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0779abf..22f329a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,14 +30,16 @@ before_install: - chmod +x scripts/build_publish.sh - chmod +x scripts/build_compile.sh - yes | sdkmanager --sdk_root=$ANDROID_SDK_ROOT "tools" "build-tools;26.0.2" "extras;android;m2repository" - - export PATH=${ANDROID_SDK_ROOT}/tools/bin:$PATH + - export ANDROID_SDK=$ANDROID_SDK_ROOT + - export PATH=$ANDROID_SDK/emulator:$ANDROID_SDK/tools:$PATH + - export PATH=$ANDROID_SDK/tools/bin:$PATH - ./gradlew dependencies || true before_script: - git lfs pull - find /usr/local/android-sdk/system-images -type f - echo no | android create avd --force -n test -k "system-images;android-$EMULATOR_API_LEVEL;default;x86" -c 100M - - emulator -avd test -kernel $SYSTEM_IMAGE -no-audio -no-window & + - emulator @test -kernel $SYSTEM_IMAGE -no-audio -no-window & - android-wait-for-emulator - adb shell input keyevent 82 & From 68614b1e4c1aca994a8bf1d62b081cd1cfaf9e5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ang=C3=A9lica=20Oliveira?= Date: Mon, 25 Nov 2019 17:51:59 -0300 Subject: [PATCH 23/30] fixing ci --- .travis.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 22f329a..f94f06d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,11 +2,12 @@ language: android jdk: oraclejdk8 env: global: + - ABI="google_apis;armeabi-v7a" - ANDROID_API=29 - - ANDROID_BUILD_TOOLS=26.0.2 + - ANDROID_BUILD_TOOLS=28.0.3 - ADB_INSTALL_TIMEOUT=5 - - EMULATOR_API_LEVEL=27 - - SYSTEM_IMAGE=/usr/local/android-sdk/system-images/android-27/default/x86/kernel-ranchu-64 + - EMULATOR_API_LEVEL=23 + - SYSTEM_IMAGE=/usr/local/android-sdk/system-images/android-23/google_apis/armeabi-v7a/kernel-ranchu - ANDROID_SDK_ROOT=/usr/local/android-sdk android: @@ -19,7 +20,7 @@ android: - extra-google-google_play_services - extra-google-m2repository - extra-android-m2repository - - sys-img-x86-android-$EMULATOR_API_LEVEL + - sys-img-armeabi-v7a-android-$EMULATOR_API_LEVEL licenses: - android-sdk-preview-license-.+ @@ -29,7 +30,7 @@ before_install: - chmod +x gradlew - chmod +x scripts/build_publish.sh - chmod +x scripts/build_compile.sh - - yes | sdkmanager --sdk_root=$ANDROID_SDK_ROOT "tools" "build-tools;26.0.2" "extras;android;m2repository" + - yes | sdkmanager --sdk_root=$ANDROID_SDK_ROOT "tools" "build-tools;$ANDROID_BUILD_TOOLS" "extras;android;m2repository" - export ANDROID_SDK=$ANDROID_SDK_ROOT - export PATH=$ANDROID_SDK/emulator:$ANDROID_SDK/tools:$PATH - export PATH=$ANDROID_SDK/tools/bin:$PATH @@ -38,7 +39,7 @@ before_install: before_script: - git lfs pull - find /usr/local/android-sdk/system-images -type f - - echo no | android create avd --force -n test -k "system-images;android-$EMULATOR_API_LEVEL;default;x86" -c 100M + - echo no | android create avd --force -n test -k "system-images;android-$EMULATOR_API_LEVEL;$ABI" -c 100M - emulator @test -kernel $SYSTEM_IMAGE -no-audio -no-window & - android-wait-for-emulator - adb shell input keyevent 82 & From 854b2eb55a14975a920ae3bc9c031c6e27dc8d90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ang=C3=A9lica=20Oliveira?= Date: Mon, 25 Nov 2019 17:59:11 -0300 Subject: [PATCH 24/30] fixing ci --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f94f06d..fd4b8df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: android jdk: oraclejdk8 env: global: - - ABI="google_apis;armeabi-v7a" + - ABI="default;armeabi-v7a" - ANDROID_API=29 - ANDROID_BUILD_TOOLS=28.0.3 - ADB_INSTALL_TIMEOUT=5 From 116ce12321b44b3e425ab2978ff661fd340fe389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ang=C3=A9lica=20Oliveira?= Date: Mon, 25 Nov 2019 18:06:09 -0300 Subject: [PATCH 25/30] fixing ci --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fd4b8df..a0f940b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ env: - ANDROID_BUILD_TOOLS=28.0.3 - ADB_INSTALL_TIMEOUT=5 - EMULATOR_API_LEVEL=23 - - SYSTEM_IMAGE=/usr/local/android-sdk/system-images/android-23/google_apis/armeabi-v7a/kernel-ranchu + - SYSTEM_IMAGE=/usr/local/android-sdk/system-images/android-23/default/armeabi-v7a/kernel-ranchu - ANDROID_SDK_ROOT=/usr/local/android-sdk android: From 3785ec49e4a6a6099640016fae61cdfc15a25fbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ang=C3=A9lica=20Oliveira?= Date: Tue, 26 Nov 2019 10:16:01 -0300 Subject: [PATCH 26/30] fix tests dependencies --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index a0f940b..17624d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,10 +30,14 @@ before_install: - chmod +x gradlew - chmod +x scripts/build_publish.sh - chmod +x scripts/build_compile.sh +# Android test (screenshot) commands init + - pip install pillow + - pip install pillowcase - yes | sdkmanager --sdk_root=$ANDROID_SDK_ROOT "tools" "build-tools;$ANDROID_BUILD_TOOLS" "extras;android;m2repository" - export ANDROID_SDK=$ANDROID_SDK_ROOT - export PATH=$ANDROID_SDK/emulator:$ANDROID_SDK/tools:$PATH - export PATH=$ANDROID_SDK/tools/bin:$PATH + # Android test (screenshot) commands end - ./gradlew dependencies || true before_script: From a91aceb28b92ce09c476a4102a135eab858c0510 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ang=C3=A9lica=20Oliveira?= Date: Tue, 26 Nov 2019 10:27:52 -0300 Subject: [PATCH 27/30] fix tests dependencies --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 17624d7..e685376 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,8 +31,8 @@ before_install: - chmod +x scripts/build_publish.sh - chmod +x scripts/build_compile.sh # Android test (screenshot) commands init - - pip install pillow - - pip install pillowcase + - sudo pip install pillow + - sudo pip install pillowcase - yes | sdkmanager --sdk_root=$ANDROID_SDK_ROOT "tools" "build-tools;$ANDROID_BUILD_TOOLS" "extras;android;m2repository" - export ANDROID_SDK=$ANDROID_SDK_ROOT - export PATH=$ANDROID_SDK/emulator:$ANDROID_SDK/tools:$PATH From 36e95ad63725cf2a0c63763bce2a6dd09889d126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ang=C3=A9lica=20Oliveira?= Date: Tue, 26 Nov 2019 11:09:46 -0300 Subject: [PATCH 28/30] adding cache to build --- .travis.yml | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index e685376..a1f8c12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ jdk: oraclejdk8 env: global: - ABI="default;armeabi-v7a" - - ANDROID_API=29 - ANDROID_BUILD_TOOLS=28.0.3 - ADB_INSTALL_TIMEOUT=5 - EMULATOR_API_LEVEL=23 @@ -15,7 +14,6 @@ android: - tools - platform-tools - build-tools-$ANDROID_BUILD_TOOLS - - android-$ANDROID_API - android-$EMULATOR_API_LEVEL - extra-google-google_play_services - extra-google-m2repository @@ -26,13 +24,12 @@ android: - android-sdk-preview-license-.+ - android-sdk-license-.+ - google-gdk-license-.+ + before_install: - chmod +x gradlew - chmod +x scripts/build_publish.sh - chmod +x scripts/build_compile.sh -# Android test (screenshot) commands init - - sudo pip install pillow - - sudo pip install pillowcase + # Android test (screenshot) commands init - yes | sdkmanager --sdk_root=$ANDROID_SDK_ROOT "tools" "build-tools;$ANDROID_BUILD_TOOLS" "extras;android;m2repository" - export ANDROID_SDK=$ANDROID_SDK_ROOT - export PATH=$ANDROID_SDK/emulator:$ANDROID_SDK/tools:$PATH @@ -40,6 +37,22 @@ before_install: # Android test (screenshot) commands end - ./gradlew dependencies || true +install: + # Android test (screenshot) commands init + - sudo pip install pillow + - sudo pip install pillowcase + # Android test (screenshot) commands end + +cache: + directories: + - $HOME/.cache/pip + - $HOME/.gradle/caches/ + - $HOME/.gradle/wrapper/ +before_cache: + - rm -f $HOME/.cache/pip/log/debug.log + - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock + - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ + before_script: - git lfs pull - find /usr/local/android-sdk/system-images -type f From 5adfa05d3b8234f109de6eca7aec1bd9f9f74b5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ang=C3=A9lica=20Oliveira?= Date: Tue, 26 Nov 2019 11:43:38 -0300 Subject: [PATCH 29/30] trying fail build --- .travis.yml | 4 ++-- system/src/main/java/com/selem/system/GreenView.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a1f8c12..15181aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,8 +39,8 @@ before_install: install: # Android test (screenshot) commands init - - sudo pip install pillow - - sudo pip install pillowcase + - sudo -H pip install pillow + - sudo -H pip install pillowcase # Android test (screenshot) commands end cache: diff --git a/system/src/main/java/com/selem/system/GreenView.kt b/system/src/main/java/com/selem/system/GreenView.kt index 4cc7642..1447e4a 100644 --- a/system/src/main/java/com/selem/system/GreenView.kt +++ b/system/src/main/java/com/selem/system/GreenView.kt @@ -11,6 +11,6 @@ class GreenView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0): View(context, attrs, defStyleAttr) { init { - background = ColorDrawable(ContextCompat.getColor(context, android.R.color.holo_green_light)) + background = ColorDrawable(ContextCompat.getColor(context, android.R.color.holo_red_dark)) } } \ No newline at end of file From 75ab1ad04e5a98e067705cadd824205dfe7f7a25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ang=C3=A9lica=20Oliveira?= Date: Tue, 26 Nov 2019 12:04:41 -0300 Subject: [PATCH 30/30] fixing tests --- system/src/main/java/com/selem/system/GreenView.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/src/main/java/com/selem/system/GreenView.kt b/system/src/main/java/com/selem/system/GreenView.kt index 1447e4a..4cc7642 100644 --- a/system/src/main/java/com/selem/system/GreenView.kt +++ b/system/src/main/java/com/selem/system/GreenView.kt @@ -11,6 +11,6 @@ class GreenView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0): View(context, attrs, defStyleAttr) { init { - background = ColorDrawable(ContextCompat.getColor(context, android.R.color.holo_red_dark)) + background = ColorDrawable(ContextCompat.getColor(context, android.R.color.holo_green_light)) } } \ No newline at end of file