From 7f58e07be945db7b249be6fba775bf25f29a2f5f Mon Sep 17 00:00:00 2001
From: isuPatches <isuPatches@yahoo.com>
Date: Sun, 23 Jul 2017 08:49:17 -0500
Subject: [PATCH] Another travis adjustment

---
 .travis.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 27e782fd..ccaaf1b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,31 +9,31 @@ cache:
 
 env:
   global:
-    - ANDROID_API_LEVEL=26
+#    - ANDROID_MIN_API_LEVEL=16
+#    - ANDROID_MAX_API_LEVEL=26
     - ANDROID_BUILD_TOOLS_VERSION=26.0.0
     - ADB_INSTALL_TIMEOUT=20 # minutes (2 minutes by default)
-  env:
-    matrix:
-      - EMULATOR_API_LEVEL=android-16 ANDROID_ABI=armeabi-v7a
-      - EMULATOR_API_LEVEL=android-25 ANDROID_ABI=armeabi-v7a
+  matrix:
+    - API=android-16 ABI=armeabi-v7a
+    - API=android-26 ABI=armeabi-v7a
 
 android:
   components:
     - tools
     - platform-tools
-    - tools
     - build-tools-$ANDROID_BUILD_TOOLS_VERSION
-    - android-$ANDROID_API_LEVEL
-    - android-$EMULATOR_API_LEVEL
-    - sys-img-armeabi-v7a-android-$ANDROID_API_LEVEL
-    - sys-img-armeabi-v7a-android-$EMULATOR_API_LEVEL
+    - android-16
+    - android-26
     - extra-android-m2repository
     - extra-android-support
     - extra-google-m2repository
 
 before_script:
-  - echo no | android create avd --force -n test -t "android-"$EMULATOR_API_LEVEL --abi $ANDROID_ABI
-  - emulator -avd test -no-skin -no-audio -no-window &
+  - android-update-sdk --components=sys-img-$ABI-$API --accept-licenses='android-sdk-license-[0-9a-f]{8}'
+  - echo no | android create avd --force -n test -t $API --abi $ABI
+  - emulator -avd test -no-audio -no-window
   - android-wait-for-emulator
+  - adb shell input keyevent 82 &
 
-script: travis_wait 60 ./gradlew clean connectedAndroidTest -PdisablePreDex --stacktrace
\ No newline at end of file
+script:
+  - travis_wait 60 ./gradlew clean connectedAndroidTest -PdisablePreDex --stacktrace
\ No newline at end of file