Using newest base image with Appium 1.22.3

Updated base image that contains Appium 1.22.2
Updated base image that contains Appium 1.22.1
2026-07-31 04:07:25 +00:00 · 2022-05-02 10:05:39 +02:00 · 2022-04-25 16:03:44 +02:00 · 2022-04-25 15:49:55 +02:00 · 2022-04-08 12:45:34 +02:00 · 2022-04-08 12:35:43 +02:00
262 changed files with 6906 additions and 492 deletions
@@ -0,0 +1 @@
+*.mp4 filter=lfs diff=lfs merge=lfs -text
@@ -0,0 +1,17 @@
+# These are supported funding model platforms
+
+# Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: [budtmo]
+
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+
+# Bitcoin (BTC)
+custom:
+- "paypal.me/budtmo"
@@ -0,0 +1,28 @@
+---
+
+name: 🐛 Bug report
+about: Report a bug to improve the tool
+---
+
+## 🐛 Bug Report
+
+Operating System: 
+<!-- OSX Yosemite, Ubuntu 18.04, Windows 10 etc -->
+
+Docker Image:
+<!-- budtmo/docker-android-x86-7.1.1, budtmo/docker-android-real-device etc -->
+
+Docker Version:  
+<!-- 17.09.0-ce, 17.06.2-ce etc -->
+
+Docker-compose version (Only if you use it):  
+<!-- 1.16.1 etc -->
+
+Docker Command to start docker-android:  
+<!-- docker run ...  -->
+  
+## Expected Behavior
+<!-- Explaination about expected behaviour goes here -->
+
+## Actual Behavior
+<!-- Explaination about actual behaviour goes here -->
@@ -0,0 +1,16 @@
+---
+
+name: 🚀 Feature Request
+about: Submit your idea to have cool features
+---
+
+## 🚀 Feature Request
+
+Idea: 
+<!-- A clear explanation about the feature -->
+
+Problems that want to be solved:
+<!-- A clear explanation about why we need that feature -->
+
+Note:  
+<!-- Additional note  -->
@@ -0,0 +1,9 @@
+---
+
+name: 💬 Questions / Help
+about: If you have questions, please check the group chat
+---
+
+## 💬 Questions and Help
+
+**Please make sure that it is an issue / a feature request. If it is a question / help wanted, please visit [our group chat](https://gitter.im/budtmo/docker-android). Thank you!**
@@ -0,0 +1,12 @@
+### Purpose of changes
+<!-- Please describe why this change is required / What problem you want to solve. -->
+
+### Types of changes
+_Put an `x` in the boxes that apply_
+
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+
+### How has this been tested?
+<!-- Please describe in detail how you tested your changes. -->
@@ -7,6 +7,3 @@
 coverage.xml
 xunit.xml
 coverage/*
-
-# Video
-video*
@@ -1,24 +0,0 @@
-language: python
-
-python:
-  - "3.5"
-
-sudo: required
-
-services:
-  - docker
-
-install: "pip install -r requirements.txt"
-
-env:
-  - ANDROID_VERSION=5.0.1
-  - ANDROID_VERSION=5.1.1
-  - ANDROID_VERSION=6.0
-  - ANDROID_VERSION=7.0
-  - ANDROID_VERSION=7.1.1
-  - REAL_DEVICE=True
-
-script: bash travis.sh
-
-after_success:
-  - bash <(curl -s https://codecov.io/bash)
@@ -0,0 +1,37 @@
+# Docker-Android's Anonymous Aggregate User Behaviour Analytics
+Docker-Android has begun gathering anonymous aggregate user behaviour analytics and reporting these to Google Analytics. You are notified about this when you start Docker-Android.
+
+## Why?
+Docker-Android is provided free of charge for our internal and external users and we don't have direct communication with its users nor time resources to ask directly for their feedback. As a result, we now use anonymous aggregate user analytics to help us understand how Docker-Android is being used, the most common used features based on how, where and when people use it. With this information we can prioritize some features over other ones.
+
+## What?
+Docker-Android's analytics record some shared information for every event:
+
+- The Google Analytics version i.e. `1` (https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#v)
+- The Google Analytics anonymous IP setting is enabled i.e. `1` (https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#aip)
+- The Docker-Android analytics tracking ID e.g. `UA-133466903-1` (https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#tid)
+- The release version of machine, e.g. `Linux_version_4.4.16-boot2docker_(gcc_version_4.9.2_(Debian_4.9.2-10)_)_#1_SMP_Fri_Jul_29_00:13:24_UTC_2016` This does not allow us to track individual users but does enable us to accurately measure user counts vs. event counts (https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#cid)
+- Docker-Android analytics hit type, e.g. `event` (https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#t)
+- Application type, e.g. `Emulator` (https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#ec)
+- Description will contains information about Emulator configuration, e.g. `Processor type`. (https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#el)
+- Docker-Android application name, e.g. `docker-android` (https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#an)
+- Docker-Android application version, e.g. `1.5-p0` (https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#av)
+
+With the recorded information, it is not possible for us to match any particular real user.
+
+As far as we can tell it would be impossible for Google to match the randomly generated analytics user ID to any other Google Analytics user ID. If Google turned evil the only thing they could do would be to lie about anonymising IP addresses and attempt to match users based on IP addresses.
+
+## When/Where?
+Docker-Android's analytics are sent throughout Docker-Android's execution to Google Analytics over HTTPS.
+
+## Who?
+Docker-Android's analytics are accessible to Docker-Android's current maintainers. Contact [@budtmo](https://github.com/budtmo) if you are a maintainer and need access.
+
+## How?
+The code is viewable in [this script](./src/appium.sh).
+
+## Opting out before starting Docker-Android
+Docker-Android analytics helps us, maintainers and leaving it on is appreciated. However, if you want to opt out and not send any information, you can do this by using passing environment variable GA=false to the Docker container.
+
+## Disclaimer
+This document and the implementation are based on the great idea implemented by [Homebrew](https://github.com/Homebrew/brew/blob/master/docs/Analytics.md)
@@ -1,13 +0,0 @@
-Copyright 2016 budi utomo
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
@@ -0,0 +1,36 @@
+## License Information
+
+Copyright 2016 budi utomo
+
+This program is subject to the terms of the Apache License, Version 2.0 AND the following amendments on forks and data processing. Thus, this is a Custom Apache 2.0 License, NOT a dual-license model you may choose from.
+
+
+You can obtain a copy of the license at http://www.apache.org/licenses/LICENSE-2.0
+
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
+
+## Forks
+Additionally to Apache-2.0, when you fork this repo you are required to either remove our Google Analytics tracking ID: UA-133466903-1 or stop usage gathering completely.
+
+## Data processing agreement
+By using this software you agree that the following non-PII (non personally identifiable information) data will be collected, processed and used by the maintainers for the purpose of improving the docker-android project. Anonymisation with respect of the IP address means that only the first two octets of the IP address are collected.
+
+
+By using this software you also grant us a nonexclusive, irrevocable, world-wide, perpetual royalty-free permission to use, modify and publish these data for all purposes, internally or publicly, including the right to sub-license said permission rights.
+
+
+We collect, process and use the following data:
+
+* Release version of Docker-Android
+* Anonymized IP address (only first two octets)
+* Country and city
+* Date and time when Docker-Android started
+* User (it will collect the information about Release Version of Machine)
+* Application type, e.g. Emulator or Device or Genymotion
+* Emulator configuration, e.g. Processor type, Device name, Appium mode, Selenium grid mode and mobile test mode
+
+## End of License Information
+
+More information about anonymized data collection can be seen [here](Analytics.md)
@@ -1 +1 @@
-Budi Utomo <budi.ut.1989@gmail.com>
+Budi Utomo <budtmo.os@gmail.com>
@@ -1,19 +1,25 @@
-Docker-Android
-==============
+<p align="center">
+  <img id="header" src="./images/logo_dockerandroid_small.png" />
+</p>

-[![Join the chat at https://gitter.im/butomo1989/docker-android](https://badges.gitter.im/butomo1989/docker-android.svg)](https://gitter.im/butomo1989/docker-android?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Build Status](https://travis-ci.org/butomo1989/docker-android.svg?branch=master)](https://travis-ci.org/butomo1989/docker-android)
-[![codecov](https://codecov.io/gh/butomo1989/docker-android/branch/master/graph/badge.svg)](https://codecov.io/gh/butomo1989/docker-android)
+[![Analytics](https://ga-beacon.appspot.com/UA-133466903-1/github/budtmo/docker-android/README.md)](https://github.com/igrigorik/ga-beacon "Analytics")
+[![Join the chat at https://gitter.im/budtmo/docker-android](https://badges.gitter.im/budtmo/docker-android.svg)](https://gitter.im/budtmo/docker-android?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Build Status](https://dev.azure.com/budtmoos/budtmoos/_apis/build/status/budtmo.docker-android.test?branchName=master)](https://dev.azure.com/budtmoos/budtmoos/_build/latest?definitionId=7&branchName=master)
+[![codecov](https://codecov.io/gh/budtmo/docker-android/branch/master/graph/badge.svg)](https://codecov.io/gh/budtmo/docker-android)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/3f000ffb97db45a59161814e1434c429)](https://www.codacy.com/app/butomo1989/docker-appium?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=butomo1989/docker-appium&amp;utm_campaign=Badge_Grade)
+[![GitHub release](https://img.shields.io/github/release/budtmo/docker-android.svg)](https://github.com/budtmo/docker-android/releases)
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fbudtmo%2Fdocker-android.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fbudtmo%2Fdocker-android?ref=badge_shield)
+[![Paypal Donate](https://img.shields.io/badge/paypal-donate-blue.svg)](http://paypal.me/budtmo)
+[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)

 Docker-Android is a docker image built to be used for everything related to mobile website testing and Android project.

-Samsung Device               |  Google Device
-:---------------------------:|:---------------------------:
-![][docker android samsung]  |  ![][docker android nexus]
+Emulator - Samsung Device    | Emulator - Nexus Device     | Real Device  
+:---------------------------:|:---------------------------:|:---------------------------:
+![][emulator samsung]        |![][emulator nexus]          |![][real device]   

-Purpose
-------
+Purposes
+--------

 1. Run UI tests for mobile websites with [appium]
 2. Build Android project and run unit tests with the latest build-tools
@@ -28,29 +34,38 @@ Advantages compare with other docker-android projects
 2. Emulator for different devices / skins, such as Samsung Galaxy S6, LG Nexus 4, HTC Nexus One and more.
 3. Ability to connect to Selenium Grid
 4. Ability to control emulator from outside container by using adb connect
-5. Open source with more features coming (monkey test, support real devices with screen mirroring and video recording)
+5. Support real devices with screen mirroring
+6. Ability to record video during test execution for debugging
+7. Integrated with other cloud solutions, e.g. [Genymotion Cloud](https://www.genymotion.com/cloud/)
+8. Open source with more features coming

 List of Docker images
 ---------------------

-|Supported OS   |Android version   |API level   |Image name   |Image status   |
-|:---|:---|:---|:---|:---:|
-|Linux|5.0.1|21|butomo1989/docker-android-x86-5.0.1|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-x86-5.0.1.svg)](https://microbadger.com/images/butomo1989/docker-android-x86-5.0.1 "Get your own image badge on microbadger.com")|
-|Linux|5.1.1|22|butomo1989/docker-android-x86-5.1.1|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-x86-5.1.1.svg)](https://microbadger.com/images/butomo1989/docker-android-x86-5.1.1 "Get your own image badge on microbadger.com")|
-|Linux|6.0|23|butomo1989/docker-android-x86-6.0|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-x86-6.0.svg)](https://microbadger.com/images/butomo1989/docker-android-x86-6.0 "Get your own image badge on microbadger.com")|
-|Linux|7.0|24|butomo1989/docker-android-x86-7.0|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-x86-7.0.svg)](https://microbadger.com/images/butomo1989/docker-android-x86-7.0 "Get your own image badge on microbadger.com")|
-|Linux|7.1.1|25|butomo1989/docker-android-x86-7.1.1|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-x86-7.1.1.svg)](https://microbadger.com/images/butomo1989/docker-android-x86-7.1.1 "Get your own image badge on microbadger.com")|
-|OSX / Windows|5.0.1|21|butomo1989/docker-android-arm-5.0.1|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-arm-5.0.1.svg)](https://microbadger.com/images/butomo1989/docker-android-arm-5.0.1 "Get your own image badge on microbadger.com")|
-|OSX / Windows|5.1.1|22|butomo1989/docker-android-arm-5.1.1|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-arm-5.1.1.svg)](https://microbadger.com/images/butomo1989/docker-android-arm-5.1.1 "Get your own image badge on microbadger.com")|
-|OSX / Windows|6.0|23|butomo1989/docker-android-arm-6.0|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-arm-6.0.svg)](https://microbadger.com/images/butomo1989/docker-android-arm-6.0 "Get your own image badge on microbadger.com")|
-|OSX / Windows|7.0|24|butomo1989/docker-android-arm-7.0|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-arm-7.0.svg)](https://microbadger.com/images/butomo1989/docker-android-arm-7.0 "Get your own image badge on microbadger.com")|
-|OSX / Windows|7.1.1|25|butomo1989/docker-android-arm-7.1.1|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-arm-7.1.1.svg)](https://microbadger.com/images/butomo1989/docker-android-arm-7.1.1 "Get your own image badge on microbadger.com")|
+|OS   |Android   |API   |Browser   |Browser version   |Chromedriver   |Image   |Size   |
+|:---|:---|:---|:---|:---|:---|:---|:---|
+|Linux|6.0|23|browser|44.0|2.18|budtmo/docker-android-x86-6.0|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-6.0.svg)](https://microbadger.com/images/budtmo/docker-android-x86-6.0 "Get your own image badge on microbadger.com")|
+|Linux|7.0|24|chrome|51.0|2.23|budtmo/docker-android-x86-7.0|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-7.0.svg)](https://microbadger.com/images/budtmo/docker-android-x86-7.0 "Get your own image badge on microbadger.com")|
+|Linux|7.1.1|25|chrome|55.0|2.28|budtmo/docker-android-x86-7.1.1|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-7.1.1.svg)](https://microbadger.com/images/budtmo/docker-android-x86-7.1.1 "Get your own image badge on microbadger.com")|
+|Linux|8.0|26|chrome|58.0|2.31|budtmo/docker-android-x86-8.0|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-8.0.svg)](https://microbadger.com/images/budtmo/docker-android-x86-8.0 "Get your own image badge on microbadger.com")|
+|Linux|8.1|27|chrome|61.0|2.33|budtmo/docker-android-x86-8.1|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-8.1.svg)](https://microbadger.com/images/budtmo/docker-android-x86-8.1 "Get your own image badge on microbadger.com")|
+|Linux|9.0|28|chrome|66.0|2.40|budtmo/docker-android-x86-9.0|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-9.0.svg)](https://microbadger.com/images/budtmo/docker-android-x86-9.0 "Get your own image badge on microbadger.com")|
+|Linux|10.0|29|chrome|74.0|74.0.3729.6|budtmo/docker-android-x86-10.0|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-10.0.svg)](https://microbadger.com/images/budtmo/docker-android-x86-10.0 "Get your own image badge on microbadger.com")|
+|Linux|11.0|30|chrome|83.0|83.0.4103.39|budtmo/docker-android-x86-11.0|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-11.0.svg)](https://microbadger.com/images/budtmo/docker-android-x86-11.0 "Get your own image badge on microbadger.com")|
+|Linux|12.0|31|chrome|93.0|93.0.4577.15|budtmo/docker-android-x86-12.0|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-12.0.svg)](https://microbadger.com/images/budtmo/docker-android-x86-12.0 "Get your own image badge on microbadger.com")|
+|All |-|-|-|-|-|budtmo/docker-android-real-device|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-real-device.svg)](https://microbadger.com/images/budtmo/docker-android-real-device "Get your own image badge on microbadger.com")|
+|All|All|All|All|All|All|budtmo/docker-android-genymotion|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-genymotion.svg)](https://microbadger.com/images/budtmo/docker-android-genymotion "Get your own image badge on microbadger.com")|

 List of Devices
 ---------------

 Type   | Device Name
 -----  | -----
+Phone  | Samsung Galaxy S10
+Phone  | Samsung Galaxy S9
+Phone  | Samsung Galaxy S8
+Phone  | Samsung Galaxy S7 Edge
+Phone  | Samsung Galaxy S7
 Phone  | Samsung Galaxy S6
 Phone  | Nexus 4
 Phone  | Nexus 5
@@ -66,21 +81,25 @@ Docker is installed in your system.
 Quick Start
 -----------

-1. Run docker-android
+1. Your machine need to support virtualization. To check it:
+
+	```
+	sudo apt install cpu-checker
+	kvm-ok
+	```
+
+2. Run Docker-Android

 	- For ***Linux OS***, please use image name that contains "x86"

 		```bash
-		docker run --privileged -d -p 6080:6080 -p 5554:5554 -p 5555:5555 -e DEVICE="Samsung Galaxy S6" --name android-container butomo1989/docker-android-x86-7.1.1
+		docker run --privileged -d -p 6080:6080 -p 5554:5554 -p 5555:5555 -e DEVICE="Samsung Galaxy S6" --name android-container budtmo/docker-android-x86-8.1
 		```

-	- For ***OSX*** and ***Windows OS***, please use image name that contains "arm"
+	- For ***OSX*** and ***Windows OS***, please use Virtual Machine that support Virtualization with Ubuntu OS

-		```bash
-		docker run --privileged -d -p 6080:6080 -p 5554:5554 -p 5555:5555 -e DEVICE="Samsung Galaxy S6" --name android-container butomo1989/docker-android-arm-7.1.1
-		```

-2. Verify the ip address of docker host.
+3. Verify the ip address of docker host.

   - For OSX, you can find out by using following command:

@@ -90,53 +109,61 @@ Quick Start

   - For different OS, localhost should work.

-3. Open ***http://docker-host-ip-address:6080*** from web browser.
+4. Open ***http://docker-host-ip-address:6080*** from web browser. Note: Adding ```?view_only=true``` will give user only view only permission.

-Run Appium Server
-----------------
+Custom configurations
+---------------------

-Appium is automation test framework to test mobile website and mobile application, including android. To be able to use appium, you need to run appium-server. You run appium server inside docker-android container by ***opening port 4723*** and ***passing an environment variable APPIUM=TRUE***.
+[This document](README_CUSTOM_CONFIG.md) contains custom configurations of Docker-Android that you might need, e.g. Proxy, Changing language on fly, etc.

-```bash
-docker run --privileged -d -p 6080:6080 -p 5554:5554 -p 5555:5555 -p 4723:4723 -e DEVICE="Samsung Galaxy S6" -e APPIUM=True --name android-container butomo1989/docker-android-x86-7.1.1
-```
+Build Android project
+---------------------

-### Connect to Selenium Grid
+Docker-Android can be used for building Android project and executing its unit test. This following steps will illustrate how to build Android project:

-It is also possible to connect appium server that run inside docker-android with selenium grid by passing following environment variables:
+1. Clone [this sample test project](https://github.com/android/testing-samples).

- CONNECT\_TO\_GRID=True
- APPIUM_HOST="\<host\_ip\_address>"
- APPIUM_PORT=\<port\_number>
- SELENIUM_HOST="\<host\_ip\_address>"
- SELENIUM_PORT=\<port\_number>
+    ```bash
+    git clone git@github.com:android/testing-samples.git
+    ```

-To run tests for mobile browser, following parameter can be passed:
+2. Build the project

- MOBILE\_WEB\_TEST=True
+    ```bash
+    docker run -it --rm -v $PWD/testing-samples/ui/espresso/BasicSample:/tmp -w /tmp budtmo/docker-android-x86-8.1 /tmp/gradlew build
+    ```

-```bash
-docker run --privileged -d -p 6080:6080 -p 4723:4723 -p 5554:5554 -p 5555:5555 -e DEVICE="Samsung Galaxy S6" -e APPIUM=True -e CONNECT_TO_GRID=True -e APPIUM_HOST="127.0.0.1" -e APPIUM_PORT=4723 -e SELENIUM_HOST="172.17.0.1" -e SELENIUM_PORT=4444 -e MOBILE_WEB_TEST=True --name android-container butomo1989/docker-android-x86-7.1.1
-```
+Control Android connected to host (Emulator or Real Device)
+-----------------------------------------------------------
+1. Create a docker container with this command

-### Share Volume
+	```
+	$ docker run --privileged -d -p 6080:6080 -p 5554:5554 -p 5555:5555 -p 4723:4723 --name android-container-appium budtmo/docker-android-real-device
+	```

-If you want to use appium to test UI of your android application, you need to share volume where the APK is located to folder ***/root/tmp***.
+2. Open noVNC [http://localhost:6080](http://localhost:6080)

-```bash
-docker run --privileged -d -p 6080:6080 -p 4723:4723 -p 5554:5554 -p 5555:5555 -v $PWD/example/sample_apk:/root/tmp -e DEVICE="Nexus 5" -e APPIUM=True -e CONNECT_TO_GRID=True -e APPIUM_HOST="127.0.0.1" -e APPIUM_PORT=4723 -e SELENIUM_HOST="172.17.0.1" -e SELENIUM_PORT=4444 --name android-container butomo1989/docker-android-x86-7.1.1
-```
+3. Open terminal by clicking right on **noVNC** window >> **Terminal emulator**

-### Docker-Compose
+4. To connect to host's adb (make sure your host have adb and connected to the device.)

-![][compose]
-![][connected_devices]
+	```
+	$ adb -H host.docker.internal devices
+	```

-There is [example of compose file] to run complete selenium grid and docker-android container as nodes. [docker-compose] version [1.13.0] or higher is required to be able to execute that compose file.
+	To specify port, just add `-P port_number`

-```bash
-docker-compose up -d
-```
+	```
+	$ adb -H host.docker.internal -P 5037 devices
+	```
+
+5. Now your container can access your host devices. But, you need to add `remoteAdbHost` and `adbPort` desired capabilities to make **Appium** can recognise those devices.  
+
+
+Appium and Selenium Grid
+------------------------
+
+If you want to use Appium and Selenium Grid, you can follow [this document](README_APPIUM_AND_SELENIUM.md). It also contains sample and use cases.

 Control android emulator outside container
 ------------------------------------------
@@ -187,6 +214,34 @@ SMS Simulation

 ![][sms]

+Google Play Services and Google Play Store
+------------------------------------------
+Not installed at this time.
+
+Jenkins
+-------
+
+This [document](README_JENKINS.md) gives you information about custom plugin that supports Docker-Android.
+
+VMWARE
+------
+
+This [document](README_VMWARE.md) shows you how to configure Virtual Machine on VMWARE to be able to run Docker-Android.
+
+Cloud
+-----
+
+This [document](README_CLOUD.md) contains information about deploying Docker-Android on cloud services.
+
+Genymotion
+----------
+
+<p align="center">
+  <img id="geny" src="./images/logo_genymotion_and_dockerandroid.png" />
+</p>
+
+For you who do not have ressources to maintain the simulator or to buy machines or need different device profiles, you need to give a try to [Genymotion Cloud](https://www.genymotion.com/cloud/). Docker-Android is integrated with Genymotion on different cloud services, e.g. Genymotion Cloud, AWS, GCP, Alibaba Cloud. Please follow [this document](README_GENYMOTION.md) or [this blog](https://medium.com/genymobile/run-your-appium-tests-using-docker-android-genymotion-cloud-e4817132ccd8) for more detail.
+
 Troubleshooting
 ---------------
 All logs inside container are stored under folder **/var/log/supervisor**. you can print out log file by using **docker exec**. Example:
@@ -195,15 +250,42 @@ All logs inside container are stored under folder **/var/log/supervisor**. you c
 docker exec -it android-container tail -f /var/log/supervisor/docker-android.stdout.log
 ```

+Emulator Skins
+--------------
+The Emulator skins are taken from [Android Studio IDE](https://developer.android.com/studio) and [Samsung Developer Website](https://developer.samsung.com/)
+
+
+Monitoring
+----------
+You can use [cadvisor](https://github.com/google/cadvisor) combined with influxdb / prometheus and grafana if needed to monitor each running container.
+
+Users
+-----
+Docker-Android are being used by 100+ countries around the world.
+
+[![ga-datastudio-docker-android](./images/docker-android_users.png)](https://datastudio.google.com/s/ht7HVKHKAQE)
+
+Stargazers over time
+--------------------
+
+[![Stargazers over time](https://starchart.cc/budtmo/docker-android.svg)](https://starchart.cc/budtmo/docker-android)
+
+Special Thanks
+--------------
+- [Gian Christanto] for creating a great logo!
+
+LICENSE
+--------------
+See [License](LICENSE.md)
+
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fbudtmo%2Fdocker-android.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fbudtmo%2Fdocker-android?ref=badge_large)
+
 [appium]: <https://appium.io>
-[espresso]: <https://google.github.io/android-testing-support-library/docs/espresso/>
+[espresso]: <https://developer.android.com/training/testing/espresso/>
 [robotium]: <https://github.com/RobotiumTech/robotium>
-[docker android samsung]: <images/docker_android_samsung.png>
-[docker android nexus]: <images/docker_android_nexus.png>
-[compose]: <images/compose.png>
-[connected_devices]: <images/connected_devices.png>
-[example of compose file]: <docker-compose.yml>
-[docker-compose]: <https://docs.docker.com/compose/install/>
-[1.13.0]: <https://github.com/docker/compose/releases/tag/1.13.0>
+[emulator samsung]: <images/emulator_samsung_galaxy_s6.png>
+[emulator nexus]: <images/emulator_nexus_5.png>
+[real device]: <images/real_device.png>
 [adb_connection]: <images/adb_connection.png>
 [sms]: <images/SMS.png>
+[gian christanto]: <https://www.linkedin.com/in/gian-christanto-0b398b131/>
@@ -0,0 +1,56 @@
+Run Appium Server
+-----------------
+
+Appium is automation test framework to test mobile website and mobile application, including Android. To be able to use Appium, you need to run appium-server. You run Appium-Server inside docker-android container by ***opening port 4723*** and ***passing an environment variable APPIUM=true***.
+
+```bash
+docker run --privileged -d -p 6080:6080 -p 5554:5554 -p 5555:5555 -p 4723:4723 -e DEVICE="Samsung Galaxy S6" -e APPIUM=true --name android-container budtmo/docker-android-x86-8.1
+```
+
+### Share Volume
+
+If you want to use appium to test UI of your android application, you need to share volume where the APK is located to folder ***/root/tmp***.
+
+```bash
+docker run --privileged -d -p 6080:6080 -p 4723:4723 -p 5554:5554 -p 5555:5555 -v $PWD/example/sample_apk:/root/tmp -e DEVICE="Nexus 5" -e APPIUM=true -e CONNECT_TO_GRID=true -e APPIUM_HOST="127.0.0.1" -e APPIUM_PORT=4723 -e SELENIUM_HOST="172.17.0.1" -e SELENIUM_PORT=4444 --name android-container budtmo/docker-android-x86-8.1
+```
+
+### Connect to Selenium Grid
+
+It is also possible to connect appium server that run inside docker-android with selenium grid by passing following environment variables:
+
+- CONNECT\_TO\_GRID=true
+- APPIUM_HOST="\<host\_ip\_address>"
+- APPIUM_PORT=\<port\_number>
+- SELENIUM_HOST="\<host\_ip\_address>"
+- SELENIUM_PORT=\<port\_number>
+- SELENIUM_TIMEOUT=\<timeout\_in\_seconds>
+- SELENIUM_PROXY_CLASS=\<selenium\_proxy\_class\_name>
+
+To run tests for mobile browser, following parameter can be passed:
+
+- MOBILE\_WEB\_TEST=true
+
+```bash
+docker run --privileged -d -p 6080:6080 -p 4723:4723 -p 5554:5554 -p 5555:5555 -e DEVICE="Samsung Galaxy S6" -e APPIUM=true -e CONNECT_TO_GRID=true -e APPIUM_HOST="127.0.0.1" -e APPIUM_PORT=4723 -e SELENIUM_HOST="172.17.0.1" -e SELENIUM_PORT=4444 -e MOBILE_WEB_TEST=true --name android-container budtmo/docker-android-x86-8.1
+```
+
+### Video Recording
+
+You can deactivate auto_record by changing the value to "False" in docker-compose file. e.g. change value to "False" in this [line](docker-compose.yml#L70).
+
+### Relaxed Security
+
+Pass environment variable RELAXED_SECURITY=true to disable additional security check to use some advanced features.
+
+### Docker-Compose
+
+![][compose]
+
+There is [example of compose file](docker-compose.yml) to run complete selenium grid and docker-android container as nodes. [docker-compose](https://docs.docker.com/compose/install/) version [1.13.0](https://github.com/docker/compose/releases/tag/1.13.0) or higher is required to be able to execute that compose file.
+
+```bash
+docker-compose up -d
+```
+
+[compose]: <images/compose.png>
@@ -0,0 +1,25 @@
+Azure
+-----
+
+Make sure that the nodes, pods, containers for your emulators are generated within a **VM** of series **Dv3** or **Ev3**.
+Reference: https://docs.microsoft.com/en-us/azure/virtual-machines/windows/nested-virtualization
+
+AWS
+-----
+Make sure that containers for your emulators are generated within a EC2 Bare Metal Instance(i3.metal)
+Reference: https://aws.amazon.com/jp/blogs/aws/new-amazon-ec2-bare-metal-instances-with-direct-access-to-hardware/
+
+Google Cloud (GCE)
+------------------
+Make sure your instances for your emulators have Nested Virtualization enabled
+Reference: https://cloud.google.com/compute/docs/instances/enable-nested-virtualization-vm-instances
+
+One the disk and instance are created as [specified here](https://cloud.google.com/compute/docs/instances/enable-nested-virtualization-vm-instances#enablenestedvirt),
+the emulator can be brought up as follows:
+
+    # Assume app.apk is in /tmp
+    docker run --privileged -d -e DEVICE="Samsung Galaxy S6" --volume /tmp:/APK \
+         --name android_em budtmo/docker-android-x86-8.1
+
+    docker exec android_em adb wait-for-device 
+    docker exec android_em adb install /APK/app.apk
@@ -0,0 +1,93 @@
+VNC pass
+--------
+
+Passing ```VNC_PASSWORD="your_pass_here"``` will secure your vnc connection. 
+
+Proxy
+-----
+
+You can enable proxy inside container and Android emulator by passing following environment variables:
+
+- HTTP_PROXY="http://\<docker\_bridge\_ip>:<port>"
+- HTTPS_PROXY=""http://\<docker\_bridge\_ip>:<port>"
+- NO_PROXY="localhost"
+- ENABLE_PROXY_ON_EMULATOR=true
+
+Proxy with authentication
+----
+
+You can set proxy with authentication by passing following environment variable:
+
+- HTTP_PROXY_USER="\<username>"
+- HTTP_PROXY_PASSWORD="\<password>"
+
+
+Language
+--------
+
+You can change the language setting of Android Emulator on the fly by passing following environment variable:
+
+- LANGUAGE="\<language>"
+- COUNTRY="\<country>"
+
+Data partition size
+-------------------
+
+The size of the data partition can be set by passing the following environment variable:
+
+- DATAPARTITION="\<size>"
+
+The value can be specified in the same format that is used by the emulator config file (`disk.dataPartition.size`), e.g. `800m`.
+
+Camera
+------
+
+Passing following environment variable to be able to connect laptop / pc camera to Android emulator:
+
+- EMULATOR_ARGS="-camera-back webcam0"
+
+Custom Avd name Arguments
+-------------------------
+
+Passing following environment variable to set a custom avd name
+
+- AVD_NAME="customName"
+
+
+Custom Emulator Arguments
+-------------------------
+
+If you want to add more arguments for running emulator, you can ***pass an environment variable EMULATOR_ARGS*** while running docker command.
+
+```bash
+docker run --privileged -d -p 6080:6080 -p 4723:4723 -p 5554:5554 -p 5555:5555 -e DEVICE="Samsung Galaxy S6" -e EMULATOR_ARGS="-no-snapshot-load -partition-size 512" --name android-container budtmo/docker-android-x86-8.1
+```
+
+Appium Test Distribution (ATD)
+------------------------------
+
+You can enable [ATD](https://github.com/AppiumTestDistribution/AppiumTestDistribution) by passing environment variable ATD=true and bind the port to the host, e.g. -p 4567:4567
+
+SaltStack
+---------
+
+You can enable [SaltStack](https://github.com/saltstack/salt) to control running containers by passing environment variable SALT_MASTER=<ip_address_of_salt_master>.
+
+Back & Restore
+--------------
+
+If you want to backup/reuse the avds created with furture upgrades or for replication, run the container with two extra mounts
+
+- -v local_backup/.android:/root/.android
+- -v local_backup/android_emulator:/root/android_emulator
+
+```bash
+docker run --privileged -d -p 6080:6080 -p 4723:4723 -p 5554:5554 -p 5555:5555 -v local_backup/.android:/root/.android -v local_backup/android_emulator:/root/android_emulator -e DEVICE="Nexus 5" --name android-container budtmo/docker-android-x86-8.1
+```
+
+For the first run, this will create a new avd and all the changes will be accessible in the `local_backup` directory. Now for all future runs, it will reuse the avds. Even this should work with new releases of `docker-android`
+
+Nginx
+-----
+
+Sample nginx configuration can be found [here](nginx)
@@ -0,0 +1,41 @@
+Genymotion Cloud
+----------------
+
+![Genymotion](images/logo_genymotion.png)
+
+You can easily scale your Appium tests on Genymotion Android virtual devices in the cloud. They are available on [SaaS](http://bit.ly/2YP0P1l) or as virtual images on AWS, GCP or Alibaba Cloud.
+
+1. On SaaS <br />
+	Use [device.json](genymotion/example/sample_devices/devices.json) to define the device to start. You can specify the port on which the device will start so you don't need to change the device name in your tests every time you need to run those tests. Then run following command
+
+	```bash
+	export USER="xxx"
+	export PASS="xxx"
+
+	docker run -it --rm -p 4723:4723 -v $PWD/genymotion/example/sample_devices:/root/tmp -e TYPE=SaaS -e USER=$USER -e PASS=$PASS budtmo/docker-android-genymotion
+	```
+
+	In case you are interesed to play around with Genymotion on SaaS, you can register to [this link](http://bit.ly/2YP0P1l) to get 1000 free minutes for free.
+
+2. On PaaS (AWS) <br />
+	Use [aws.json](genymotion/example/sample_devices/aws.json) to define configuration of EC2 instance and run following command:
+
+	```bash
+	docker run -it --rm -p 4723:4723 -v $PWD/genymotion/example/sample_devices:/root/tmp -v ~/.aws:/root/.aws -e TYPE=aws budtmo/docker-android-genymotion
+	```
+
+	Existing security group and subnet can be used:
+
+	```json
+	[
+		{
+			"region": "us-west-2",
+			"instance": "t2.small",
+			"AMI": "ami-0673cbd39ef84d97c",
+			"SG": "sg-000aaa",
+			"subnet_id": "subnet-000aaa"
+		}
+	]
+	``` 
+
+You can also use [this docker-compose file](genymotion/example/geny.yml). 
@@ -0,0 +1,6 @@
+Jenkins
+-------
+
+Following Jenkins plug-ins supports Docker-Android to optimize your work.
+
+1. Live preview: [budtmo/jenkins-plugin-vncviewer-docker-container](https://github.com/budtmo/vncviewer-docker-container-plugin)
@@ -0,0 +1,85 @@
+VMWare Fusion on OSX
+--------------------
+
+The following instructions are used for OS X. You'll need [docker-machine-parallels](https://github.com/Parallels/docker-machine-parallels) to create a virtual machine (vm) with tiny core linux for running docker images. After that, you may start the vm you created for VMWare Fusion or Parallels Desktop and run a docker container inside this vm. If you're going to use the android docker of emulator with x86 processor, setup this vm for nested virtualization and kvm support before you run a docker container.
+
+1. Install docker-machine-parallels via Homebrew:
+    ```bash
+    $ brew install docker-machine-parallels
+    ```
+
+2. Create a virtual machine for running docker images based on the virtual machine tool you use
+
+    2.1. Create a virtual machine of VMWare Fusion
+    ```bash
+    $ docker-machine create --driver=vmwarefusion vmware-dev
+    ```
+
+    2.2. Create a virtual machine of Parallels Desktop
+    ```bash
+    $ docker-machine create --driver=parallels prl-dev
+    ```
+
+    This utility `docker-machine-parallels` will fetch boot2docker.iso to create a vm of VMWare fusion or Parallels Desktop. When the vm is created, you'll see it's booted with VMWare fusion or Parallels Desktop where the network of vm is set to NAT and one IP is assigned. You'll be able to connect to vnc service inside the docker image through that IP. Say it's `10.211.55.3` and we'll use it later.
+
+3. Setup the virtual machine for nested virtualization support
+
+    3.1. Shutdown the vm by running the command below in the boot2docker vm before you setup it.
+    ```bash
+    # shutdown -h now
+    ```
+
+    If you use VMWare Fusion, go to menu bar > Vitual Machine > Settings > Processors and Memory, expand Advanced options, and select `Enable hypervisor applications in this virtual machine`.
+
+    ![Enable nested virtualization for VMWare Fusion](images/vmwarefusion_enable_nested_virtualization.png)
+
+    If you use Parallels Desktop, open settings screen of that vm and go to `CPU & Memory` under `hardware` tab, expand Advanced settings and select `Enable nested virtualization`.
+
+    ![Enable nested virtualization for Parallels Desktop](images/parallels_enable_nested_virtualization.png)
+
+4. Enable kvm inside virtual machine
+
+    4.0 SSH to the machine
+    ```bash
+    docker-machine ssh vmware-dev
+    ```
+
+    4.1 Check kvm version
+    ```bash
+    # version
+    $ 10.1
+    ```
+    
+    Go to http://tinycorelinux.net/10.x/x86_64/tcz/ and check your kvm version, for version 10.1 is kvm-4.19.10-tinycore64.tcz
+    
+    4.2. Run as an account other than root to install kvm packages using tce-load.
+    ```bash
+    # su docker
+    $ tce-load -wi kvm-4.19.10-tinycore64.tcz
+    ```
+
+    4.3. Run as root to load kvm module after kvm packages install.
+    ```bash
+    $ sudo modprobe kvm_intel
+    ```
+
+    4.4. Check if the kvm device is loaded.
+    ```bash
+    $ ls /dev/kvm
+    ```
+
+    4.5. Check if your CPU supports hardware virtualization now
+    ```bash
+    $ egrep -c '(vmx|svm)' /proc/cpuinfo
+    ```
+
+    If **0** it means that your CPU doesn't support hardware virtualization.
+    If **1** or more it does - but you still need to make sure that virtualization is enabled in the BIOS.
+
+5. You may now run a docker container
+    5.1. Let's run a docker image for an emulator with x86 processor.
+    ```bash
+    docker run --privileged -d -p 6080:6080 -p 5554:5554 -p 5555:5555 -e DEVICE="Samsung Galaxy S6" --name android-container budtmo/docker-android-x86-8.1
+    ```
+
+    When the services inside this docker container are running, connect to http://10.211.55.3:6080/vnc.html (the IP we got when the docker machine was created) and login. The emulator with x86 processor should be running on screen.
@@ -0,0 +1,86 @@
+# Kubernetes & Azure (AKS, Terraform, Kompose, Kubectl, Azure CLI)
+
+  - Azure CLI configuration
+  - Infrastructure as code for Azure
+  - Generating Kubernetes configuration files with Kompose (Services, Deployments, Pods & Persistent volumes)
+  - Terraform with Azure Provider
+  - Kubectl configuration
+
+## Setting up Azure CLI 
+
+ - Install Azure CLI -> https://docs.microsoft.com/en-us/cli/azure/install-azure-cli?view=azure-cli-latest
+ - Execute ```sh $ az login ``` and authenticate with your Azure account
+ - Execute ```sh $ az account show --query "{subscriptionId:id, tenantId:tenantId"  ``` . Then copy subscriptionId and tenantId
+ - Execute ```sh $ az account set --subscription="${SUBSCRIPTION_ID}" ``` . Replace ${SUBSCRIPTION_ID} for your subscriptionId copied
+
+## Create infrastucture in Azure (AKS Service with node master)
+
+Terraform version >= v0.11.7
+
+ - Install Terraform -> https://www.terraform.io/downloads.html
+ - Edit vars with Azure Account values in ```sh terraform.tfvars ```
+ - After that:
+
+ ```sh
+ $ terraform init
+ $ terraform plan
+ $ terraform apply
+ ```
+
+## Setting up Kubectl with Azure account
+
+ - For apply Kubernetes files:
+
+ First configurate azure-cli with Azure account and install kubernetes tools with az: 
+
+ ```sh 
+ $ az aks install-cli 
+ ```
+
+ Then log in in to the Azure Container Registry (if you're using it, but dockerhub or other):
+
+ ```sh
+ $ az acr login
+ ```
+
+ After that, connect to cluster with Kubectl:
+
+ ```sh
+ $  az aks get-credentials --resource-group docker-android --name k8s-docker-android
+ ``` 
+
+## Running with custom K8s files (Recommended)
+
+ - You can use this approach or Kompose (Next 2 steps)
+
+ ```sh
+ $ kubectl create -f volumes.yaml
+ $ kubectl create -f services_deployments.yaml
+ ```
+
+## Generate Kube files with Kompose
+
+ - Install Kompose -> https://github.com/kubernetes/kompose
+
+ Kompose version: >= 1.1.0
+
+ - For convert to Kompose:
+
+ ```sh
+ $ cd kompose
+ $ kompose convert -f ../kompose.yml
+ ```
+
+## Execute Kube files (Kompose)
+
+ - First create Persistent Volume Claims, then Services; finally Deployments files. For example:
+
+ ```sh 
+ $ cd kompose
+ $ kubectl create -f nexus-7.1.1-claim0-persistentvolumeclaim.yaml 
+ $ kubectl create -f nexus-7.1.1-claim1-persistentvolumeclaim.yaml 
+ $ kubectl create -f nexus-7.1.1-service.yaml 
+ $ kubectl create -f nexus-7.1.1-deployment.yaml 
+ ```
+
+
@@ -0,0 +1,114 @@
+# Note: It requires docker-compose 1.13.0
+#
+# Usage: docker-compose up -d
+version: "3"
+
+services:
+  # Selenium hub
+  selenium_hub:
+    image: selenium/hub:3.14.0-curium
+    ports:
+      - 4444:4444
+
+  # There is a bug for using appium. Issue: https://github.com/butomo1989/docker-android/issues/73
+  # Real devices
+  #real_device:
+  #  image: butomo1989/docker-android-real-device
+  #  privileged: true
+  #  depends_on:
+  #    - selenium_hub
+  #  ports:
+  #    - 6080:6080
+  #  volumes:
+  #    - ./video-real-device:/tmp/video
+  #    - /dev/bus/usb:/dev/bus/usb
+  #    - ~/.android:/root/.android
+  #  environment:
+  #    - CONNECT_TO_GRID=true
+  #    - APPIUM=true
+  #    - SELENIUM_HOST=selenium_hub
+  #    - AUTO_RECORD=true
+  #    - BROWSER_NAME=chrome
+
+  # Using Appium Docker Android  
+  real_device:
+    image: appium/appium
+    depends_on:
+      - selenium_hub
+    network_mode: "service:selenium_hub"
+    privileged: true
+    volumes:
+      - /dev/bus/usb:/dev/bus/usb
+      - ~/.android:/root/.android
+      - ../example/sample_apk:/root/tmp
+    environment:
+      - CONNECT_TO_GRID=true
+      - SELENIUM_HOST=selenium_hub
+      # Enable it for msite testing
+      #- BROWSER_NAME=chrome
+
+  # Docker-Android for Android application testing
+  nexus_7.1.1:
+    image: butomo1989/docker-android-x86-7.1.1
+    privileged: true
+    # Increase scale number if needed
+    #scale: 1
+    depends_on:
+      - selenium_hub
+      - real_device
+    ports:
+      - 6080
+    # Change path of apk that you want to test. I use sample_apk that I provide in folder "example"
+    volumes:
+      - ../example/sample_apk:/root/tmp/sample_apk
+      - ../video-nexus_7.1.1:/tmp/video
+    environment:
+      - DEVICE=Nexus 5
+      - CONNECT_TO_GRID=true
+      - APPIUM=true
+      - SELENIUM_HOST=selenium_hub
+      - AUTO_RECORD=true
+
+  # Docker-Android for mobile website testing with chrome browser
+  # Chrome browser exists only for version 7.0 and 7.1.1
+  samsung_galaxy_web_7.1.1:
+    image: butomo1989/docker-android-x86-8.1
+    privileged: true
+    # Increase scale number if needed
+    #scale: 1
+    depends_on: 
+      - selenium_hub
+      - real_device
+    ports:
+      - 6080
+    volumes:
+      - ../video-samsung_7.1.1:/tmp/video
+    environment:
+      - DEVICE=Samsung Galaxy S6
+      - CONNECT_TO_GRID=true
+      - APPIUM=true
+      - SELENIUM_HOST=selenium_hub
+      - MOBILE_WEB_TEST=true
+      - AUTO_RECORD=true
+
+  # Docker-Android for mobile website testing with default browser
+  # Default browser exists only for version 5.0.1, 5.1.1 and 6.0
+  samsung_galaxy_web_5.1.1:
+    image: butomo1989/docker-android-x86-5.1.1
+    privileged: true
+    # Increase scale number if needed
+    #scale: 1
+    depends_on:
+      - selenium_hub
+      - real_device
+    ports:
+      - 6080
+    volumes:
+      - ../video-samsung_5.1.1:/tmp/video
+    environment:
+      - DEVICE=Samsung Galaxy S6
+      - CONNECT_TO_GRID=true
+      - APPIUM=true
+      - SELENIUM_HOST=selenium_hub
+      - MOBILE_WEB_TEST=true
+      - AUTO_RECORD=true
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: nexus-7.1.1-claim0
+  name: nexus-7.1.1-claim0
+spec:
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+status: {}
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: nexus-7.1.1-claim1
+  name: nexus-7.1.1-claim1
+spec:
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+status: {}
@@ -0,0 +1,53 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: kompose convert -f ../kompose.yml
+    kompose.version: 1.1.0 (36652f6)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: nexus-7.1.1
+  name: nexus-7.1.1
+spec:
+  replicas: 1
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      creationTimestamp: null
+      labels:
+        io.kompose.service: nexus-7.1.1
+    spec:
+      containers:
+      - env:
+        - name: APPIUM
+          value: "true"
+        - name: AUTO_RECORD
+          value: "true"
+        - name: CONNECT_TO_GRID
+          value: "true"
+        - name: DEVICE
+          value: Nexus 5
+        - name: SELENIUM_HOST
+          value: selenium_hub
+        image: butomo1989/docker-android-x86-7.1.1
+        name: nexus-7.1.1
+        ports:
+        - containerPort: 6080
+        resources: {}
+        securityContext:
+          privileged: true
+        volumeMounts:
+        - mountPath: /root/tmp/sample_apk
+          name: nexus-7.1.1-claim0
+        - mountPath: /tmp/video
+          name: nexus-7.1.1-claim1
+      restartPolicy: Always
+      volumes:
+      - name: nexus-7.1.1-claim0
+        persistentVolumeClaim:
+          claimName: nexus-7.1.1-claim0
+      - name: nexus-7.1.1-claim1
+        persistentVolumeClaim:
+          claimName: nexus-7.1.1-claim1
+status: {}
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    kompose.cmd: kompose convert -f ../kompose.yml
+    kompose.version: 1.1.0 (36652f6)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: nexus-7.1.1
+  name: nexus-7.1.1
+spec:
+  ports:
+  - name: "6080"
+    port: 6080
+    targetPort: 6080
+  selector:
+    io.kompose.service: nexus-7.1.1
+status:
+  loadBalancer: {}
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: real-device-claim0
+  name: real-device-claim0
+spec:
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+status: {}
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: real-device-claim1
+  name: real-device-claim1
+spec:
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+status: {}
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: real-device-claim2
+  name: real-device-claim2
+spec:
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+status: {}
@@ -0,0 +1,50 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: kompose convert -f ../kompose.yml
+    kompose.version: 1.1.0 (36652f6)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: real-device
+  name: real-device
+spec:
+  replicas: 1
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      creationTimestamp: null
+      labels:
+        io.kompose.service: real-device
+    spec:
+      containers:
+      - env:
+        - name: CONNECT_TO_GRID
+          value: "true"
+        - name: SELENIUM_HOST
+          value: selenium_hub
+        image: appium/appium
+        name: real-device
+        resources: {}
+        securityContext:
+          privileged: true
+        volumeMounts:
+        - mountPath: /dev/bus/usb
+          name: real-device-claim0
+        - mountPath: /root/.android
+          name: real-device-claim1
+        - mountPath: /root/tmp
+          name: real-device-claim2
+      restartPolicy: Always
+      volumes:
+      - name: real-device-claim0
+        persistentVolumeClaim:
+          claimName: real-device-claim0
+      - name: real-device-claim1
+        persistentVolumeClaim:
+          claimName: real-device-claim1
+      - name: real-device-claim2
+        persistentVolumeClaim:
+          claimName: real-device-claim2
+status: {}
@@ -0,0 +1,20 @@
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    kompose.cmd: kompose convert -f ../kompose.yml
+    kompose.version: 1.1.0 (36652f6)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: real-device
+  name: real-device
+spec:
+  clusterIP: None
+  ports:
+  - name: headless
+    port: 55555
+    targetPort: 0
+  selector:
+    io.kompose.service: real-device
+status:
+  loadBalancer: {}
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: samsung-galaxy-web-5.1.1-claim0
+  name: samsung-galaxy-web-5.1.1-claim0
+spec:
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+status: {}
@@ -0,0 +1,50 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: kompose convert -f ../kompose.yml
+    kompose.version: 1.1.0 (36652f6)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: samsung-galaxy-web-5.1.1
+  name: samsung-galaxy-web-5.1.1
+spec:
+  replicas: 1
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      creationTimestamp: null
+      labels:
+        io.kompose.service: samsung-galaxy-web-5.1.1
+    spec:
+      containers:
+      - env:
+        - name: APPIUM
+          value: "true"
+        - name: AUTO_RECORD
+          value: "true"
+        - name: CONNECT_TO_GRID
+          value: "true"
+        - name: DEVICE
+          value: Samsung Galaxy S6
+        - name: MOBILE_WEB_TEST
+          value: "true"
+        - name: SELENIUM_HOST
+          value: selenium_hub
+        image: butomo1989/docker-android-x86-5.1.1
+        name: samsung-galaxy-web-5.1.1
+        ports:
+        - containerPort: 6080
+        resources: {}
+        securityContext:
+          privileged: true
+        volumeMounts:
+        - mountPath: /tmp/video
+          name: samsung-galaxy-web-5.1.1-claim0
+      restartPolicy: Always
+      volumes:
+      - name: samsung-galaxy-web-5.1.1-claim0
+        persistentVolumeClaim:
+          claimName: samsung-galaxy-web-5.1.1-claim0
+status: {}
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    kompose.cmd: kompose convert -f ../kompose.yml
+    kompose.version: 1.1.0 (36652f6)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: samsung-galaxy-web-5.1.1
+  name: samsung-galaxy-web-5.1.1
+spec:
+  ports:
+  - name: "6080"
+    port: 6080
+    targetPort: 6080
+  selector:
+    io.kompose.service: samsung-galaxy-web-5.1.1
+status:
+  loadBalancer: {}
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: samsung-galaxy-web-7.1.1-claim0
+  name: samsung-galaxy-web-7.1.1-claim0
+spec:
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+status: {}
@@ -0,0 +1,50 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: kompose convert -f ../kompose.yml
+    kompose.version: 1.1.0 (36652f6)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: samsung-galaxy-web-7.1.1
+  name: samsung-galaxy-web-7.1.1
+spec:
+  replicas: 1
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      creationTimestamp: null
+      labels:
+        io.kompose.service: samsung-galaxy-web-7.1.1
+    spec:
+      containers:
+      - env:
+        - name: APPIUM
+          value: "true"
+        - name: AUTO_RECORD
+          value: "true"
+        - name: CONNECT_TO_GRID
+          value: "true"
+        - name: DEVICE
+          value: Samsung Galaxy S6
+        - name: MOBILE_WEB_TEST
+          value: "true"
+        - name: SELENIUM_HOST
+          value: selenium_hub
+        image: butomo1989/docker-android-x86-8.1
+        name: samsung-galaxy-web-7.1.1
+        ports:
+        - containerPort: 6080
+        resources: {}
+        securityContext:
+          privileged: true
+        volumeMounts:
+        - mountPath: /tmp/video
+          name: samsung-galaxy-web-7.1.1-claim0
+      restartPolicy: Always
+      volumes:
+      - name: samsung-galaxy-web-7.1.1-claim0
+        persistentVolumeClaim:
+          claimName: samsung-galaxy-web-7.1.1-claim0
+status: {}
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    kompose.cmd: kompose convert -f ../kompose.yml
+    kompose.version: 1.1.0 (36652f6)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: samsung-galaxy-web-7.1.1
+  name: samsung-galaxy-web-7.1.1
+spec:
+  ports:
+  - name: "6080"
+    port: 6080
+    targetPort: 6080
+  selector:
+    io.kompose.service: samsung-galaxy-web-7.1.1
+status:
+  loadBalancer: {}
@@ -0,0 +1,27 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: kompose convert -f ../kompose.yml
+    kompose.version: 1.1.0 (36652f6)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: selenium-hub
+  name: selenium-hub
+spec:
+  replicas: 1
+  strategy: {}
+  template:
+    metadata:
+      creationTimestamp: null
+      labels:
+        io.kompose.service: selenium-hub
+    spec:
+      containers:
+      - image: selenium/hub:3.14.0-curium
+        name: selenium-hub
+        ports:
+        - containerPort: 4444
+        resources: {}
+      restartPolicy: Always
+status: {}
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    kompose.cmd: kompose convert -f ../kompose.yml
+    kompose.version: 1.1.0 (36652f6)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: selenium-hub
+  name: selenium-hub
+spec:
+  ports:
+  - name: "4444"
+    port: 4444
+    targetPort: 4444
+  selector:
+    io.kompose.service: selenium-hub
+status:
+  loadBalancer: {}
@@ -0,0 +1,48 @@
+
+resource "azurerm_container_service" "container_service" {
+  name                   = "k8s-docker-android"
+  resource_group_name    = "${var.resource_group_name}"
+  location               = "${var.resource_group_location}"
+  orchestration_platform = "Kubernetes"
+
+  master_profile {
+    count      = "${var.master_count}"
+    dns_prefix = "${var.dns_name_prefix}-master"
+  }
+
+  agent_pool_profile {
+    name       = "agentpools"
+    count      = "${var.linux_agent_count}"
+    dns_prefix = "${var.dns_name_prefix}-agent"
+    vm_size    = "${var.linux_agent_vm_size}"
+  }
+
+  linux_profile {
+    admin_username = "${var.linux_admin_username}"
+
+    ssh_key {
+      key_data = "${var.linux_admin_ssh_publickey}"
+    }
+  }
+
+  service_principal {
+    client_id     = "${var.service_principal_client_id}"
+    client_secret = "${var.service_principal_client_secret}"
+  }
+
+  diagnostics_profile {
+    enabled = false
+  }
+
+  tags {
+    Source = "K8s with Terraform"
+  }
+}
+
+output "master_fqdn" {
+  value = "${azurerm_container_service.container_service.master_profile.fqdn}"
+}
+
+output "ssh_command_master0" {
+  value = "ssh ${var.linux_admin_username}@${azurerm_container_service.container_service.master_profile.fqdn} -A -p 22"
+}
@@ -0,0 +1,11 @@
+
+# Use this if you can't specify your credentials in file but you need ingress in the UI console.
+provider "azurerm" {}
+
+#Use this if you can specify your credentials and no more configuration is necessary 
+ #provider "azurerm" {
+ #  subscription_id = "${var.subscription_id}"
+ #  client_id       = "${var.service_principal_client_id}"
+ #  client_secret   = "${var.service_principal_client_secret}"
+ #  tenant_id       = "${var.tenant_id}"
+ #}
@@ -0,0 +1,147 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: selenium
+spec:
+  ports:
+  - name: "4444"
+    port: 4444
+    targetPort: 4444
+  selector:
+    app: selenium
+  type: LoadBalancer
+---
+apiVersion: v1
+kind: Deployment
+metadata:
+  name: selenium-deployment
+  labels:
+    app: selenium
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: selenium
+    spec:
+      containers:
+      - image: selenium/hub:3.14.0-curium
+        name: selenium-hub
+        ports:
+        - containerPort: 4444
+        resources: {}
+      restartPolicy: Always
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: real-device
+spec:
+  clusterIP: None
+  ports:
+  - name: headless
+    port: 55555
+    targetPort: 0
+  selector:
+    app: real-device
+  type: LoadBalancer
+---
+apiVersion: v1
+kind: Deployment
+metadata:
+  labels:
+    app: real-device
+  name: real-device
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: real-device
+    spec:
+      containers:
+      - env:
+        - name: CONNECT_TO_GRID
+          value: "true"
+        - name: SELENIUM_HOST
+          value: selenium_hub
+        image: appium/appium
+        name: real-device
+        securityContext:
+          privileged: true
+        volumeMounts:
+        - mountPath: /dev/bus/usb
+          name: real-device-claim0
+        - mountPath: /root/.android
+          name: real-device-claim1
+        - mountPath: /root/tmp
+          name: real-device-claim2
+      restartPolicy: Always
+      volumes:
+      - name: real-device-claim0
+        persistentVolumeClaim:
+          claimName: real-device-claim0
+      - name: real-device-claim1
+        persistentVolumeClaim:
+          claimName: real-device-claim1
+      - name: real-device-claim2
+        persistentVolumeClaim:
+          claimName: real-device-claim2
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: nexus-7.1.1
+spec:
+  ports:
+  - name: "6080"
+    port: 6080
+    targetPort: 6080
+  selector:
+    app: nexus-7.1.1
+  type: LoadBalancer
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    app: nexus-7.1.1
+  name: nexus-7.1.1
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: nexus-7.1.1
+    spec:
+      containers:
+      - env:
+        - name: APPIUM
+          value: "true"
+        - name: AUTO_RECORD
+          value: "true"
+        - name: CONNECT_TO_GRID
+          value: "true"
+        - name: DEVICE
+          value: Nexus 5
+        - name: SELENIUM_HOST
+          value: selenium_hub
+        image: butomo1989/docker-android-x86-7.1.1
+        name: nexus-7.1.1
+        ports:
+        - containerPort: 6080
+        securityContext:
+          privileged: true
+        volumeMounts:
+        - mountPath: /root/tmp/sample_apk
+          name: nexus-7.1.1-claim0
+        - mountPath: /tmp/video
+          name: nexus-7.1.1-claim1
+      restartPolicy: Always
+      volumes:
+      - name: nexus-7.1.1-claim0
+        persistentVolumeClaim:
+          claimName: nexus-7.1.1-claim0
+      - name: nexus-7.1.1-claim1
+        persistentVolumeClaim:
+          claimName: nexus-7.1.1-claim1
@@ -0,0 +1,19 @@
+
+resource_group_name = "docker-android"
+resource_group_location = "West US"
+dns_name_prefix = "docker-android"
+linux_agent_count = "1"
+
+#Only use Dv3 or Ev3 series
+linux_agent_vm_size = "Standard_D2_v3"
+
+linux_admin_username = "(Insert any username here!)"
+linux_admin_ssh_publickey = "(Insert ssh key here!)"
+master_count = "1"
+
+
+# Azure credentials
+service_principal_client_id = "(Insert principal key client id here!)"
+service_principal_client_secret = "(Insert principal key client secret here!)"
+subscription_id = "(Insert subscription id here!)"
+tenant_id = "(Insert tenant id here!)"
@@ -0,0 +1,62 @@
+variable "resource_group_name" {
+  type        = "string"
+  description = "Name of the azure resource group."
+}
+
+variable "resource_group_location" {
+  type        = "string"
+  description = "Location of the azure resource group."
+}
+
+variable "dns_name_prefix" {
+  type        = "string"
+  description = "Sets the domain name prefix for the cluster. The suffix 'master' will be added to address the master agents and the suffix 'agent' will be added to address the linux agents."
+}
+
+variable "linux_agent_count" {
+  type        = "string"
+  default     = "1"
+  description = "The number of Kubernetes linux agents in the cluster. Allowed values are 1-100 (inclusive). The default value is 1."
+}
+
+variable "linux_agent_vm_size" {
+  type        = "string"
+  default     = "Standard_D2_v2"
+  description = "The size of the virtual machine used for the Kubernetes linux agents in the cluster."
+}
+
+variable "linux_admin_username" {
+  type        = "string"
+  description = "User name for authentication to the Kubernetes linux agent virtual machines in the cluster."
+}
+
+variable "linux_admin_ssh_publickey" {
+  type        = "string"
+  description = "Configure all the linux virtual machines in the cluster with the SSH RSA public key string. The key should include three parts, for example 'ssh-rsa AAAAB...snip...UcyupgH azureuser@linuxvm'"
+}
+
+variable "master_count" {
+  type        = "string"
+  default     = "1"
+  description = "The number of Kubernetes masters for the cluster. Allowed values are 1, 3, and 5. The default value is 1."
+}
+
+variable "service_principal_client_id" {
+  type        = "string"
+  description = "The client id of the azure service principal used by Kubernetes to interact with Azure APIs."
+}
+
+variable "service_principal_client_secret" {
+  type        = "string"
+  description = "The client secret of the azure service principal used by Kubernetes to interact with Azure APIs."
+}
+
+variable "subscription_id" {
+  type        = "string"
+  description = "Your Azure subscription"
+}
+
+variable "tenant_id" {
+  type        = "string"
+  description = "Your Azure Tenant id"
+}
@@ -0,0 +1,69 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    app: real-device-claim0
+  name: real-device-claim0
+spec:
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    app: real-device-claim1
+  name: real-device-claim1
+spec:
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    app: real-device-claim2
+  name: real-device-claim2
+spec:
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    app: nexus-7.1.1-claim0
+  name: nexus-7.1.1-claim0
+spec:
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    app: nexus-7.1.1-claim1
+  name: nexus-7.1.1-claim1
+spec:
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<d:devices xmlns:d="http://schemas.android.com/sdk/devices/2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <d:device>
+        <d:name>Samsung Galaxy S10</d:name>
+        <d:manufacturer>User</d:manufacturer>
+        <d:meta/>
+        <d:hardware>
+            <d:screen>
+                <d:screen-size>large</d:screen-size>
+                <d:diagonal-length>6.1</d:diagonal-length>
+                <d:pixel-density>xxxhdpi</d:pixel-density>
+                <d:screen-ratio>long</d:screen-ratio>
+                <d:dimensions>
+                    <d:x-dimension>1440</d:x-dimension>
+                    <d:y-dimension>3040</d:y-dimension>
+                </d:dimensions>
+                <d:xdpi>575.92</d:xdpi>
+                <d:ydpi>575.92</d:ydpi>
+                <d:touch>
+                    <d:multitouch>jazz-hands</d:multitouch>
+                    <d:mechanism>finger</d:mechanism>
+                    <d:screen-type>capacitive</d:screen-type>
+                </d:touch>
+            </d:screen>
+            <d:networking>
+                Bluetooth
+                Wifi
+                NFC
+            </d:networking>
+            <d:sensors>
+                Accelerometer
+                Barometer
+                Compass
+                GPS
+                Gyroscope
+                LightSensor
+                ProximitySensor
+            </d:sensors>
+            <d:mic>true</d:mic>
+            <d:camera>
+                <d:location>back</d:location>
+                <d:autofocus>true</d:autofocus>
+                <d:flash>true</d:flash>
+            </d:camera>
+            <d:camera>
+                <d:location>front</d:location>
+                <d:autofocus>true</d:autofocus>
+                <d:flash>true</d:flash>
+            </d:camera>
+            <d:keyboard>qwerty</d:keyboard>
+            <d:nav>nonav</d:nav>
+            <d:ram unit="GiB">4</d:ram>
+            <d:buttons>hard</d:buttons>
+            <d:internal-storage unit="GiB">
+                4
+            </d:internal-storage>
+            <d:removable-storage unit="TiB"/>
+            <d:cpu>Generic CPU</d:cpu>
+            <d:gpu>Generic GPU</d:gpu>
+            <d:abi>
+                armeabi-v7a
+                x86
+                x86_64
+            </d:abi>
+            <d:dock/>
+            <d:power-type>battery</d:power-type>
+        </d:hardware>
+        <d:software>
+            <d:api-level>-</d:api-level>
+            <d:live-wallpaper-support>true</d:live-wallpaper-support>
+            <d:bluetooth-profiles/>
+            <d:gl-version>2.0</d:gl-version>
+            <d:gl-extensions/>
+            <d:status-bar>false</d:status-bar>
+        </d:software>
+        <d:state default="true" name="Portrait">
+            <d:description>The device in portrait orientation</d:description>
+            <d:screen-orientation>port</d:screen-orientation>
+            <d:keyboard-state>keyshidden</d:keyboard-state>
+            <d:nav-state>navhidden</d:nav-state>
+        </d:state>
+        <d:state name="Landscape">
+            <d:description>The device in landscape orientation</d:description>
+            <d:screen-orientation>land</d:screen-orientation>
+            <d:keyboard-state>keyshidden</d:keyboard-state>
+            <d:nav-state>navhidden</d:nav-state>
+        </d:state>
+        <d:state name="Portrait with keyboard">
+            <d:description>The device in portrait orientation with a keyboard open</d:description>
+            <d:screen-orientation>port</d:screen-orientation>
+            <d:keyboard-state>keysexposed</d:keyboard-state>
+            <d:nav-state>navhidden</d:nav-state>
+        </d:state>
+        <d:state name="Landscape with keyboard">
+            <d:description>The device in landscape orientation with a keyboard open</d:description>
+            <d:screen-orientation>land</d:screen-orientation>
+            <d:keyboard-state>keysexposed</d:keyboard-state>
+            <d:nav-state>navhidden</d:nav-state>
+        </d:state>
+    </d:device>
+</d:devices>
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<d:devices xmlns:d="http://schemas.android.com/sdk/devices/2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <d:device>
+        <d:name>Samsung Galaxy S7</d:name>
+        <d:manufacturer>User</d:manufacturer>
+        <d:meta/>
+        <d:hardware>
+            <d:screen>
+                <d:screen-size>large</d:screen-size>
+                <d:diagonal-length>5.10</d:diagonal-length>
+                <d:pixel-density>xxxhdpi</d:pixel-density>
+                <d:screen-ratio>long</d:screen-ratio>
+                <d:dimensions>
+                    <d:x-dimension>1440</d:x-dimension>
+                    <d:y-dimension>2560</d:y-dimension>
+                </d:dimensions>
+                <d:xdpi>575.92</d:xdpi>
+                <d:ydpi>575.92</d:ydpi>
+                <d:touch>
+                    <d:multitouch>jazz-hands</d:multitouch>
+                    <d:mechanism>finger</d:mechanism>
+                    <d:screen-type>capacitive</d:screen-type>
+                </d:touch>
+            </d:screen>
+            <d:networking>
+                Bluetooth
+                Wifi
+                NFC
+            </d:networking>
+            <d:sensors>
+                Accelerometer
+                Barometer
+                Compass
+                GPS
+                Gyroscope
+                LightSensor
+                ProximitySensor
+            </d:sensors>
+            <d:mic>true</d:mic>
+            <d:camera>
+                <d:location>back</d:location>
+                <d:autofocus>true</d:autofocus>
+                <d:flash>true</d:flash>
+            </d:camera>
+            <d:camera>
+                <d:location>front</d:location>
+                <d:autofocus>true</d:autofocus>
+                <d:flash>true</d:flash>
+            </d:camera>
+            <d:keyboard>qwerty</d:keyboard>
+            <d:nav>nonav</d:nav>
+            <d:ram unit="GiB">4</d:ram>
+            <d:buttons>hard</d:buttons>
+            <d:internal-storage unit="GiB">
+                4
+            </d:internal-storage>
+            <d:removable-storage unit="TiB"/>
+            <d:cpu>Generic CPU</d:cpu>
+            <d:gpu>Generic GPU</d:gpu>
+            <d:abi>
+                armeabi-v7a
+                x86
+                x86_64
+            </d:abi>
+            <d:dock/>
+            <d:power-type>battery</d:power-type>
+        </d:hardware>
+        <d:software>
+            <d:api-level>-</d:api-level>
+            <d:live-wallpaper-support>true</d:live-wallpaper-support>
+            <d:bluetooth-profiles/>
+            <d:gl-version>2.0</d:gl-version>
+            <d:gl-extensions/>
+            <d:status-bar>false</d:status-bar>
+        </d:software>
+        <d:state default="true" name="Portrait">
+            <d:description>The device in portrait orientation</d:description>
+            <d:screen-orientation>port</d:screen-orientation>
+            <d:keyboard-state>keyshidden</d:keyboard-state>
+            <d:nav-state>navhidden</d:nav-state>
+        </d:state>
+        <d:state name="Landscape">
+            <d:description>The device in landscape orientation</d:description>
+            <d:screen-orientation>land</d:screen-orientation>
+            <d:keyboard-state>keyshidden</d:keyboard-state>
+            <d:nav-state>navhidden</d:nav-state>
+        </d:state>
+        <d:state name="Portrait with keyboard">
+            <d:description>The device in portrait orientation with a keyboard open</d:description>
+            <d:screen-orientation>port</d:screen-orientation>
+            <d:keyboard-state>keysexposed</d:keyboard-state>
+            <d:nav-state>navhidden</d:nav-state>
+        </d:state>
+        <d:state name="Landscape with keyboard">
+            <d:description>The device in landscape orientation with a keyboard open</d:description>
+            <d:screen-orientation>land</d:screen-orientation>
+            <d:keyboard-state>keysexposed</d:keyboard-state>
+            <d:nav-state>navhidden</d:nav-state>
+        </d:state>
+    </d:device>
+</d:devices>
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<d:devices xmlns:d="http://schemas.android.com/sdk/devices/2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <d:device>
+        <d:name>Samsung Galaxy S7 Edge</d:name>
+        <d:manufacturer>User</d:manufacturer>
+        <d:meta/>
+        <d:hardware>
+            <d:screen>
+                <d:screen-size>large</d:screen-size>
+                <d:diagonal-length>5.50</d:diagonal-length>
+                <d:pixel-density>xxxhdpi</d:pixel-density>
+                <d:screen-ratio>long</d:screen-ratio>
+                <d:dimensions>
+                    <d:x-dimension>1440</d:x-dimension>
+                    <d:y-dimension>2560</d:y-dimension>
+                </d:dimensions>
+                <d:xdpi>575.92</d:xdpi>
+                <d:ydpi>575.92</d:ydpi>
+                <d:touch>
+                    <d:multitouch>jazz-hands</d:multitouch>
+                    <d:mechanism>finger</d:mechanism>
+                    <d:screen-type>capacitive</d:screen-type>
+                </d:touch>
+            </d:screen>
+            <d:networking>
+                Bluetooth
+                Wifi
+                NFC
+            </d:networking>
+            <d:sensors>
+                Accelerometer
+                Barometer
+                Compass
+                GPS
+                Gyroscope
+                LightSensor
+                ProximitySensor
+            </d:sensors>
+            <d:mic>true</d:mic>
+            <d:camera>
+                <d:location>back</d:location>
+                <d:autofocus>true</d:autofocus>
+                <d:flash>true</d:flash>
+            </d:camera>
+            <d:camera>
+                <d:location>front</d:location>
+                <d:autofocus>true</d:autofocus>
+                <d:flash>true</d:flash>
+            </d:camera>
+            <d:keyboard>qwerty</d:keyboard>
+            <d:nav>nonav</d:nav>
+            <d:ram unit="GiB">4</d:ram>
+            <d:buttons>hard</d:buttons>
+            <d:internal-storage unit="GiB">
+                4
+            </d:internal-storage>
+            <d:removable-storage unit="TiB"/>
+            <d:cpu>Generic CPU</d:cpu>
+            <d:gpu>Generic GPU</d:gpu>
+            <d:abi>
+                armeabi-v7a
+                x86
+                x86_64
+            </d:abi>
+            <d:dock/>
+            <d:power-type>battery</d:power-type>
+        </d:hardware>
+        <d:software>
+            <d:api-level>-</d:api-level>
+            <d:live-wallpaper-support>true</d:live-wallpaper-support>
+            <d:bluetooth-profiles/>
+            <d:gl-version>2.0</d:gl-version>
+            <d:gl-extensions/>
+            <d:status-bar>false</d:status-bar>
+        </d:software>
+        <d:state default="true" name="Portrait">
+            <d:description>The device in portrait orientation</d:description>
+            <d:screen-orientation>port</d:screen-orientation>
+            <d:keyboard-state>keyshidden</d:keyboard-state>
+            <d:nav-state>navhidden</d:nav-state>
+        </d:state>
+        <d:state name="Landscape">
+            <d:description>The device in landscape orientation</d:description>
+            <d:screen-orientation>land</d:screen-orientation>
+            <d:keyboard-state>keyshidden</d:keyboard-state>
+            <d:nav-state>navhidden</d:nav-state>
+        </d:state>
+        <d:state name="Portrait with keyboard">
+            <d:description>The device in portrait orientation with a keyboard open</d:description>
+            <d:screen-orientation>port</d:screen-orientation>
+            <d:keyboard-state>keysexposed</d:keyboard-state>
+            <d:nav-state>navhidden</d:nav-state>
+        </d:state>
+        <d:state name="Landscape with keyboard">
+            <d:description>The device in landscape orientation with a keyboard open</d:description>
+            <d:screen-orientation>land</d:screen-orientation>
+            <d:keyboard-state>keysexposed</d:keyboard-state>
+            <d:nav-state>navhidden</d:nav-state>
+        </d:state>
+    </d:device>
+</d:devices>
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<d:devices xmlns:d="http://schemas.android.com/sdk/devices/2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <d:device>
+        <d:name>Samsung Galaxy S8</d:name>
+        <d:manufacturer>User</d:manufacturer>
+        <d:meta/>
+        <d:hardware>
+            <d:screen>
+                <d:screen-size>large</d:screen-size>
+                <d:diagonal-length>5.80</d:diagonal-length>
+                <d:pixel-density>xxxhdpi</d:pixel-density>
+                <d:screen-ratio>long</d:screen-ratio>
+                <d:dimensions>
+                    <d:x-dimension>1440</d:x-dimension>
+                    <d:y-dimension>2960</d:y-dimension>
+                </d:dimensions>
+                <d:xdpi>575.92</d:xdpi>
+                <d:ydpi>575.92</d:ydpi>
+                <d:touch>
+                    <d:multitouch>jazz-hands</d:multitouch>
+                    <d:mechanism>finger</d:mechanism>
+                    <d:screen-type>capacitive</d:screen-type>
+                </d:touch>
+            </d:screen>
+            <d:networking>
+                Bluetooth
+                Wifi
+                NFC
+            </d:networking>
+            <d:sensors>
+                Accelerometer
+                Barometer
+                Compass
+                GPS
+                Gyroscope
+                LightSensor
+                ProximitySensor
+            </d:sensors>
+            <d:mic>true</d:mic>
+            <d:camera>
+                <d:location>back</d:location>
+                <d:autofocus>true</d:autofocus>
+                <d:flash>true</d:flash>
+            </d:camera>
+            <d:camera>
+                <d:location>front</d:location>
+                <d:autofocus>true</d:autofocus>
+                <d:flash>true</d:flash>
+            </d:camera>
+            <d:keyboard>qwerty</d:keyboard>
+            <d:nav>nonav</d:nav>
+            <d:ram unit="GiB">4</d:ram>
+            <d:buttons>hard</d:buttons>
+            <d:internal-storage unit="GiB">
+                4
+            </d:internal-storage>
+            <d:removable-storage unit="TiB"/>
+            <d:cpu>Generic CPU</d:cpu>
+            <d:gpu>Generic GPU</d:gpu>
+            <d:abi>
+                armeabi-v7a
+                x86
+                x86_64
+            </d:abi>
+            <d:dock/>
+            <d:power-type>battery</d:power-type>
+        </d:hardware>
+        <d:software>
+            <d:api-level>-</d:api-level>
+            <d:live-wallpaper-support>true</d:live-wallpaper-support>
+            <d:bluetooth-profiles/>
+            <d:gl-version>2.0</d:gl-version>
+            <d:gl-extensions/>
+            <d:status-bar>false</d:status-bar>
+        </d:software>
+        <d:state default="true" name="Portrait">
+            <d:description>The device in portrait orientation</d:description>
+            <d:screen-orientation>port</d:screen-orientation>
+            <d:keyboard-state>keyshidden</d:keyboard-state>
+            <d:nav-state>navhidden</d:nav-state>
+        </d:state>
+        <d:state name="Landscape">
+            <d:description>The device in landscape orientation</d:description>
+            <d:screen-orientation>land</d:screen-orientation>
+            <d:keyboard-state>keyshidden</d:keyboard-state>
+            <d:nav-state>navhidden</d:nav-state>
+        </d:state>
+        <d:state name="Portrait with keyboard">
+            <d:description>The device in portrait orientation with a keyboard open</d:description>
+            <d:screen-orientation>port</d:screen-orientation>
+            <d:keyboard-state>keysexposed</d:keyboard-state>
+            <d:nav-state>navhidden</d:nav-state>
+        </d:state>
+        <d:state name="Landscape with keyboard">
+            <d:description>The device in landscape orientation with a keyboard open</d:description>
+            <d:screen-orientation>land</d:screen-orientation>
+            <d:keyboard-state>keysexposed</d:keyboard-state>
+            <d:nav-state>navhidden</d:nav-state>
+        </d:state>
+    </d:device>
+</d:devices>
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<d:devices xmlns:d="http://schemas.android.com/sdk/devices/2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <d:device>
+        <d:name>Samsung Galaxy S9</d:name>
+        <d:manufacturer>User</d:manufacturer>
+        <d:meta/>
+        <d:hardware>
+            <d:screen>
+                <d:screen-size>large</d:screen-size>
+                <d:diagonal-length>5.80</d:diagonal-length>
+                <d:pixel-density>xxxhdpi</d:pixel-density>
+                <d:screen-ratio>long</d:screen-ratio>
+                <d:dimensions>
+                    <d:x-dimension>1440</d:x-dimension>
+                    <d:y-dimension>2960</d:y-dimension>
+                </d:dimensions>
+                <d:xdpi>575.92</d:xdpi>
+                <d:ydpi>575.92</d:ydpi>
+                <d:touch>
+                    <d:multitouch>jazz-hands</d:multitouch>
+                    <d:mechanism>finger</d:mechanism>
+                    <d:screen-type>capacitive</d:screen-type>
+                </d:touch>
+            </d:screen>
+            <d:networking>
+                Bluetooth
+                Wifi
+                NFC
+            </d:networking>
+            <d:sensors>
+                Accelerometer
+                Barometer
+                Compass
+                GPS
+                Gyroscope
+                LightSensor
+                ProximitySensor
+            </d:sensors>
+            <d:mic>true</d:mic>
+            <d:camera>
+                <d:location>back</d:location>
+                <d:autofocus>true</d:autofocus>
+                <d:flash>true</d:flash>
+            </d:camera>
+            <d:camera>
+                <d:location>front</d:location>
+                <d:autofocus>true</d:autofocus>
+                <d:flash>true</d:flash>
+            </d:camera>
+            <d:keyboard>qwerty</d:keyboard>
+            <d:nav>nonav</d:nav>
+            <d:ram unit="GiB">4</d:ram>
+            <d:buttons>hard</d:buttons>
+            <d:internal-storage unit="GiB">
+                4
+            </d:internal-storage>
+            <d:removable-storage unit="TiB"/>
+            <d:cpu>Generic CPU</d:cpu>
+            <d:gpu>Generic GPU</d:gpu>
+            <d:abi>
+                armeabi-v7a
+                x86
+                x86_64
+            </d:abi>
+            <d:dock/>
+            <d:power-type>battery</d:power-type>
+        </d:hardware>
+        <d:software>
+            <d:api-level>-</d:api-level>
+            <d:live-wallpaper-support>true</d:live-wallpaper-support>
+            <d:bluetooth-profiles/>
+            <d:gl-version>2.0</d:gl-version>
+            <d:gl-extensions/>
+            <d:status-bar>false</d:status-bar>
+        </d:software>
+        <d:state default="true" name="Portrait">
+            <d:description>The device in portrait orientation</d:description>
+            <d:screen-orientation>port</d:screen-orientation>
+            <d:keyboard-state>keyshidden</d:keyboard-state>
+            <d:nav-state>navhidden</d:nav-state>
+        </d:state>
+        <d:state name="Landscape">
+            <d:description>The device in landscape orientation</d:description>
+            <d:screen-orientation>land</d:screen-orientation>
+            <d:keyboard-state>keyshidden</d:keyboard-state>
+            <d:nav-state>navhidden</d:nav-state>
+        </d:state>
+        <d:state name="Portrait with keyboard">
+            <d:description>The device in portrait orientation with a keyboard open</d:description>
+            <d:screen-orientation>port</d:screen-orientation>
+            <d:keyboard-state>keysexposed</d:keyboard-state>
+            <d:nav-state>navhidden</d:nav-state>
+        </d:state>
+        <d:state name="Landscape with keyboard">
+            <d:description>The device in landscape orientation with a keyboard open</d:description>
+            <d:screen-orientation>land</d:screen-orientation>
+            <d:keyboard-state>keysexposed</d:keyboard-state>
+            <d:nav-state>navhidden</d:nav-state>
+        </d:state>
+    </d:device>
+</d:devices>
@@ -0,0 +1,4 @@
+Sources
+--------
+
+The Emulator skins are taken from [Android Studio IDE](https://developer.android.com/studio) and [Samsung Developer Website](https://developer.samsung.com/home.do)
@@ -0,0 +1,4 @@
+[port-button2.png]
+rotate=rotate(2)
+[port-button3.png]
+rotate=rotate(3)
@@ -0,0 +1,21 @@
+hw.lcd.density = 550
+
+hw.trackBall = no
+
+hw.keyboard = yes
+
+hw.dPad = no
+
+hw.camera = yes
+
+hw.gps = yes
+
+hw.battery = yes
+
+hw.accelerometer = yes
+
+hw.sdCard = yes
+
+hw.touchScreen = yes
+
+hw.gsmModem = yes
@@ -0,0 +1,416 @@
+parts {
+    portrait {
+        background {
+            image   device_Port.png
+        }
+			
+    }
+    landscape {
+        background {
+            image   device_Land.png
+        }
+		
+    }
+
+    device {
+        display {
+            width   1440 
+            height  3040
+            x       0
+            y       0
+        }
+    }
+    
+    controls {
+        background {
+            image   controls.png
+        }
+        buttons {
+            camera {
+                    image button.png
+                    x 8
+                    y 8
+            }
+			volume-down {
+                    image button.png
+                    x 214
+                    y 8
+            }
+            volume-up {
+                    image button.png
+                    x 419
+                    y 8
+            }
+			power {
+                    image button.png
+                    x 624
+                    y 8
+            }
+			
+			phone-dial {
+                    image button.png
+                    x 8
+                    y 273
+            }
+            phone-hangup {
+                    image button.png
+                    x 624
+                    y 273
+            }
+			home {
+                    image button.png
+                    x 8
+                    y 537
+            }
+			menu {
+                    image button.png
+                    x 214
+                    y 537
+            }
+			back {
+                    image button.png
+                    x 419
+                    y 537
+            }
+			search {
+                    image button.png
+                    x 624
+                    y 537
+            }
+			
+            dpad-left {
+                    image arrow_left.png
+                    x 284
+                    y 201
+            }
+			dpad-up {
+                    image arrow_up.png
+                    x 8
+                    y 678
+            }
+            dpad-down {
+                    image arrow_down.png
+                    x 214
+                    y 678
+            }
+            dpad-right {
+                    image arrow_right.png
+                    x 450 
+                    y 216
+            }
+            dpad-select {
+                    image select.png
+                    x 284
+                    y 299
+            }
+        }
+    }
+
+    keyboard {
+        background {
+            image  keyboard.png
+        }
+        buttons {
+            1 {
+                image  key-num.png
+                x 17
+                y 11
+            }
+			2 {
+                image  key-num.png
+                x 149
+                y 11
+            }
+			3 {
+                image  key-num.png
+                x 282
+                y 11
+            }
+			4 {
+                image  key-num.png
+                x 413
+                y 11
+            }
+			5 {
+                image  key-num.png
+                x 545
+                y 11
+            }
+			6 {
+                image  key-num.png
+                x 677
+                y 11
+            }
+			7 {
+                image  key-num.png
+                x 809
+                y 11
+            }
+			8 {
+                image  key-num.png
+                x 941
+                y 11
+            }
+			9 {
+                image  key-num.png
+                x 1072
+                y 11
+            }
+			0 {
+                image  key-num.png
+                x 1204
+                y 11
+            }
+			
+			
+			q {
+                image  key.png
+                x 17
+                y 78
+            }
+			w {
+                image  key.png
+                x 149
+                y 78
+            }
+            e {
+                image  key.png
+                x 281
+                y 78
+            }
+            r {
+                image  key.png
+                x 412
+                y 78
+            }
+            t {
+                image  key.png
+                x 544
+                y 78
+            }
+            y {
+                image  key.png
+                x 676
+                y 78
+            }
+            u {
+                image  key.png
+                x 808
+                y 78
+            }
+            i {
+                image  key.png
+                x 940
+                y 78
+            }
+            o {
+                image  key.png
+                x 1071
+                y 78
+            }
+            p {
+                image  key.png
+                x 1201
+                y 78
+            }
+			
+			
+			a {
+                image  key.png
+                x 83
+                y 161
+            }
+            s {
+                image  key.png
+                x 215
+                y 161
+            }
+            d {
+                image  key.png
+                x 347
+                y 161
+            }
+            f {
+                image  key.png
+                x 479 
+                y 161
+            }
+            g {
+                image  key.png
+                x 610
+                y 161
+            }
+            h {
+                image  key.png
+                x 742
+                y 161
+            }
+            j {
+                image  key.png
+                x 874
+                y 161
+            }
+            k {
+                image  key.png
+                x 1006
+                y 161
+            }
+            l {
+                image  key.png
+                x 1138
+                y 161
+            }
+            
+            
+            CAP {
+                image  key2.png
+                x 17
+                y 244
+            }
+			z {
+                image  key.png
+                x 215
+                y 244
+            }
+            x {
+                image  key.png
+                x 347
+                y 244
+            }
+            c {
+                image  key.png
+                x 479
+                y 244
+            }
+            v {
+                image  key.png
+                x 610
+                y 244
+            }
+            b {
+                image  key.png
+                x 742
+                y 244
+            }
+            n {
+                image  key.png
+                x 874
+                y 244
+            }
+            m {
+                image  key.png
+                x 1006
+                y 244
+            }
+			
+			DEL {
+                image  key2.png
+                x 1138
+                y 244
+            }
+			
+			
+			
+			SYM {
+                image  key2.png
+                x 17
+                y 326
+            }
+			T {
+                image  key.png
+                x 216
+                y 326
+            }
+			SPACE {
+                image  spacebar.png
+                x 347
+                y 326
+            }
+            PERIOD {
+                image  key.png
+                x 1006
+                y 326
+            }
+            NEXT {
+                image  key2.png
+                x 1138
+                y 326
+            }
+        }
+    }
+}
+
+layouts {
+    portrait {
+        width     4120
+        height    3477
+        color     0xe0e0e0
+        event     EV_SW:0:1
+        
+        part1 {
+            name    portrait
+            x       0
+            y       0
+        }
+
+        part2 {
+            name    device
+            x       452
+            y       222
+        }
+		
+        part3 {
+            name    controls
+            x       2660
+            y       883
+        }
+        part4 {
+            name    keyboard
+            x       2385
+            y       1847
+        }
+
+    }
+
+    landscape {
+        width     4120
+        height    3477
+        color     0xe0e0e0
+        event     EV_SW:0:0
+		dpad-rotation 3
+		
+        part1 {
+            name    landscape
+            x       0
+            y       0
+        }
+
+        part2 {
+            name      device
+            x         532
+            y         1864
+            rotation  3s
+        }
+
+        part3 {
+            name     controls
+            x        2506
+            y        2072
+        }
+
+        part4 {
+            name     keyboard
+            x        744
+            y        2213              
+        }
+    }
+}
+
+keyboard {
+    charmap qwerty2
+}
+
+network {
+    speed  full
+    delay  none
+}
@@ -0,0 +1,12 @@
+name=Galaxy_S10
+vendor=Samsung Electronics Co., Inc.
+description=Android OS, v9.0 (Pie) device without physical keyboard and three way navigation.
+
+# default skin
+skin=Galaxy_S10
+
+# version of the Android platform on which this add-on is built.
+api=27
+
+# revision of the add-on
+revision=1
@@ -0,0 +1,4 @@
+[port-button2.png]
+rotate=rotate(2)
+[port-button3.png]
+rotate=rotate(3)
@@ -0,0 +1,21 @@
+hw.lcd.density = 577
+
+hw.trackBall = no
+
+hw.keyboard = yes
+
+hw.dPad = no
+
+hw.camera = yes
+
+hw.gps = yes
+
+hw.battery = yes
+
+hw.accelerometer = yes
+
+hw.sdCard = yes
+
+hw.touchScreen = yes
+
+hw.gsmModem = yes
@@ -0,0 +1,449 @@
+parts {
+    portrait {
+        background {
+            image   device_Port.png
+        }
+		buttons {
+            back {
+                    image port-button3.png
+                    x 686
+                    y 3158
+            }
+            home {
+                    image port-button2.png
+                    x 1015
+                    y 3139
+            }
+            soft-left {
+                    image port-button1.png
+                    x 1596
+                    y 3158
+            }
+		}	
+    }
+    landscape {
+        background {
+            image   device_Land.png
+        }
+		buttons {
+			soft-left {
+                    image land-button3.png
+                     x 3437
+                     y 1523
+            }
+            home {
+                    image land-button2.png
+                    x 3416
+                    y 959
+            }
+            back {
+                    image land-button1.png
+                    x 3437
+                     y 617
+            }
+		} 
+    }
+
+    device {
+        display {
+            width   1440 
+            height  2560
+            x       0
+            y       0
+        }
+    }
+    
+    controls {
+        background {
+            image   controls.png
+        }
+        buttons {
+            camera {
+                    image button.png
+                    x 8
+                    y 8
+            }
+			volume-down {
+                    image button.png
+                    x 214
+                    y 8
+            }
+            volume-up {
+                    image button.png
+                    x 419
+                    y 8
+            }
+			power {
+                    image button.png
+                    x 624
+                    y 8
+            }
+			
+			phone-dial {
+                    image button.png
+                    x 8
+                    y 273
+            }
+            phone-hangup {
+                    image button.png
+                    x 624
+                    y 273
+            }
+			home {
+                    image button.png
+                    x 8
+                    y 537
+            }
+			menu {
+                    image button.png
+                    x 214
+                    y 537
+            }
+			back {
+                    image button.png
+                    x 419
+                    y 537
+            }
+			search {
+                    image button.png
+                    x 624
+                    y 537
+            }
+			
+            dpad-left {
+                    image arrow_left.png
+                    x 284
+                    y 201
+            }
+			dpad-up {
+                    image arrow_up.png
+                    x 8
+                    y 678
+            }
+            dpad-down {
+                    image arrow_down.png
+                    x 214
+                    y 678
+            }
+            dpad-right {
+                    image arrow_right.png
+                    x 450 
+                    y 216
+            }
+            dpad-select {
+                    image select.png
+                    x 284
+                    y 299
+            }
+        }
+    }
+
+    keyboard {
+        background {
+            image  keyboard.png
+        }
+        buttons {
+            1 {
+                image  key-num.png
+                x 17
+                y 11
+            }
+			2 {
+                image  key-num.png
+                x 149
+                y 11
+            }
+			3 {
+                image  key-num.png
+                x 282
+                y 11
+            }
+			4 {
+                image  key-num.png
+                x 413
+                y 11
+            }
+			5 {
+                image  key-num.png
+                x 545
+                y 11
+            }
+			6 {
+                image  key-num.png
+                x 677
+                y 11
+            }
+			7 {
+                image  key-num.png
+                x 809
+                y 11
+            }
+			8 {
+                image  key-num.png
+                x 941
+                y 11
+            }
+			9 {
+                image  key-num.png
+                x 1072
+                y 11
+            }
+			0 {
+                image  key-num.png
+                x 1204
+                y 11
+            }
+			
+			
+			q {
+                image  key.png
+                x 17
+                y 78
+            }
+			w {
+                image  key.png
+                x 149
+                y 78
+            }
+            e {
+                image  key.png
+                x 281
+                y 78
+            }
+            r {
+                image  key.png
+                x 412
+                y 78
+            }
+            t {
+                image  key.png
+                x 544
+                y 78
+            }
+            y {
+                image  key.png
+                x 676
+                y 78
+            }
+            u {
+                image  key.png
+                x 808
+                y 78
+            }
+            i {
+                image  key.png
+                x 940
+                y 78
+            }
+            o {
+                image  key.png
+                x 1071
+                y 78
+            }
+            p {
+                image  key.png
+                x 1201
+                y 78
+            }
+			
+			
+			a {
+                image  key.png
+                x 83
+                y 161
+            }
+            s {
+                image  key.png
+                x 215
+                y 161
+            }
+            d {
+                image  key.png
+                x 347
+                y 161
+            }
+            f {
+                image  key.png
+                x 479 
+                y 161
+            }
+            g {
+                image  key.png
+                x 610
+                y 161
+            }
+            h {
+                image  key.png
+                x 742
+                y 161
+            }
+            j {
+                image  key.png
+                x 874
+                y 161
+            }
+            k {
+                image  key.png
+                x 1006
+                y 161
+            }
+            l {
+                image  key.png
+                x 1138
+                y 161
+            }
+            
+            
+            CAP {
+                image  key2.png
+                x 17
+                y 244
+            }
+			z {
+                image  key.png
+                x 215
+                y 244
+            }
+            x {
+                image  key.png
+                x 347
+                y 244
+            }
+            c {
+                image  key.png
+                x 479
+                y 244
+            }
+            v {
+                image  key.png
+                x 610
+                y 244
+            }
+            b {
+                image  key.png
+                x 742
+                y 244
+            }
+            n {
+                image  key.png
+                x 874
+                y 244
+            }
+            m {
+                image  key.png
+                x 1006
+                y 244
+            }
+			
+			DEL {
+                image  key2.png
+                x 1138
+                y 244
+            }
+			
+			
+			
+			SYM {
+                image  key2.png
+                x 17
+                y 326
+            }
+			T {
+                image  key.png
+                x 216
+                y 326
+            }
+			SPACE {
+                image  spacebar.png
+                x 347
+                y 326
+            }
+            PERIOD {
+                image  key.png
+                x 1006
+                y 326
+            }
+            NEXT {
+                image  key2.png
+                x 1138
+                y 326
+            }
+        }
+    }
+}
+
+layouts {
+    portrait {
+        width     4120
+        height    3477
+        color     0xe0e0e0
+        event     EV_SW:0:1
+        
+        part1 {
+            name    portrait
+            x       0
+            y       0
+        }
+
+
+
+        part3 {
+            name    device
+            x       456
+            y       498
+        }
+        part4 {
+            name    controls
+            x       2660
+            y       883
+        }
+        part5 {
+            name    keyboard
+            x       2385
+            y       1847
+        }
+
+    }
+
+    landscape {
+        width     4120
+        height    3477
+        color     0xe0e0e0
+        event     EV_SW:0:0
+		dpad-rotation 3
+		
+        part1 {
+            name    landscape
+            x       0
+            y       0
+        }
+
+        part2 {
+            name      device
+            x         777
+            y         1854
+            rotation  3s
+        }
+
+        part3 {
+            name     controls
+            x        2506
+            y        2072
+        }
+
+        part4 {
+            name     keyboard
+            x        744
+            y        2213              
+        }
+    }
+}
+
+keyboard {
+    charmap qwerty2
+}
+
+network {
+    speed  full
+    delay  none
+}
@@ -0,0 +1,12 @@
+name=Galaxy_S7
+vendor=Samsung Electronics Co., Inc.
+description=Android OS, v6.0 (Marshmallow) device without physical keyboard and three way navigation.
+
+# default skin
+skin=Galaxy_S7
+
+# version of the Android platform on which this add-on is built.
+api=9
+
+# revision of the add-on
+revision=1
--- a/Show More
+++ b/Show More