Using Appium 1.17.0

Add optional env to set avd name

.github/ISSUE_TEMPLATE/bug.md

@@ -1,10 +1,16 @@
-**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/butomo1989/docker-android). Thank you!**
+---
+
+name: 🐛 Bug report
+about: Report a bug to improve the tool
+---
+
+## 🐛 Bug Report
 
 Operating System: 
-<!-- OSX Yosemite, Ubuntu 16.04, Windows 10 etc -->
+<!-- OSX Yosemite, Ubuntu 18.04, Windows 10 etc -->
 
 Docker Image:
-<!-- butomo1989/docker-android-x86-7.1.1, butomo1989/docker-android-real-device etc -->
+<!-- budtmo/docker-android-x86-7.1.1, budtmo/docker-android-real-device etc -->
 
 Docker Version:  
 <!-- 17.09.0-ce, 17.06.2-ce etc -->

.github/ISSUE_TEMPLATE/feature.md

@@ -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  -->

.github/ISSUE_TEMPLATE/question.md

@@ -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!**

.travis.yml

@@ -19,6 +19,7 @@ env:
   - ANDROID_VERSION=8.0
   - ANDROID_VERSION=8.1
   - ANDROID_VERSION=9.0
+  - ANDROID_VERSION=10.0
   - REAL_DEVICE=True
   - GENYMOTION=True
 

Analytics.md

@@ -25,7 +25,7 @@ As far as we can tell it would be impossible for Google to match the randomly ge
 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 [@butomo1989](https://github.com/butomo1989) if you are a maintainer and need access.
+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 lines](./src/appium.sh#L225-L247).

README.md

@@ -3,11 +3,13 @@
 </p>
 
 [![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/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)
+[![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://travis-ci.org/budtmo/docker-android.svg?branch=master)](https://travis-ci.org/budtmo/docker-android)
 [![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)
+[![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.
 
@@ -49,14 +51,20 @@ List of Docker images
 |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")|
 |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")|
-|Linux|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")|
+|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
@@ -105,16 +113,16 @@ Build Android project
 
 Docker-Android can be used for building Android project and executing its unit test. This following steps will illustrate how to build Android project:
 
-1. Clone [this sample test project](https://github.com/googlesamples/android-testing).
+1. Clone [this sample test project](https://github.com/android/testing-samples).
 
     ```bash
-    git clone git@github.com:googlesamples/android-testing.git
+    git clone git@github.com:android/testing-samples.git
     ```
 
 2. Build the project
 
     ```bash
-    docker run -it --rm -v $PWD/android-testing/ui/espresso/BasicSample:/root/tmp budtmo/docker-android-x86-8.1 tmp/gradlew build
+    docker run -it --rm -v $PWD/testing-samples/ui/espresso/BasicSample:/tmp -w /tmp budtmo/docker-android-x86-8.1 /tmp/gradlew build
     ```
     
 Control Android connected to host (Emulator or Real Device)
@@ -203,6 +211,11 @@ Google Play Services and Google Play Store
 
 Docker-Android contains Google Play Service (v12.8.74) and Google Play Store (v11.0.50). Both applications are downloaded from [apklinker](https://www.apklinker.com/), so please be aware of it in case you use private/company account to that applications.
 
+Jenkins
+-------
+
+This [document](README_JENKINS.md) gives you information about custom plugin that supports Docker-Android.
+
 VMWARE
 ------
 
@@ -230,6 +243,14 @@ 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](e)
+
+Security
+--------
+All docker images are protected by [Polyverse](https://polyverse.io/) by scrambling the Linux packages. For more information please read [this](https://polyverse.io/how-it-works/)
+
 Special Thanks
 --------------
 - [Gian Christanto] for creating a great logo!
@@ -238,6 +259,8 @@ 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://developer.android.com/training/testing/espresso/>
 [robotium]: <https://github.com/RobotiumTech/robotium>

README_CUSTOM_CONFIG.md

@@ -1,11 +1,12 @@
 Proxy
 -----
 
-You can enable proxy inside container by passing following environment variables:
+You can enable proxy inside container and Android emulator by passing following environment variables:
 
-- HTTP_PROXY="\<docker\_bridge\_ip\_address>"
+- HTTP_PROXY="http://\<docker\_bridge\_ip>:<port>"
-- HTTPS_PROXY="\<docker\_bridge\_ip\_address>"
+- HTTPS_PROXY=""http://\<docker\_bridge\_ip>:<port>"
 - NO_PROXY="localhost"
+- ENABLE_PROXY_ON_EMULATOR=true
 
 Language
 --------
@@ -15,6 +16,15 @@ You can change the language setting of Android Emulator on the fly by passing fo
 - 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
 ------
 
@@ -22,6 +32,14 @@ Passing following environment variable to be able to connect laptop / pc camera
 
 - 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
 -------------------------
 
@@ -31,6 +49,16 @@ If you want to add more arguments for running emulator, you can ***pass an envir
 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
 --------------
 
@@ -40,7 +68,7 @@ If you want to backup/reuse the avds created with furture upgrades or for replic
 - -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:local_backup/android_emulator -e DEVICE="Nexus 5" --name android-container budtmo/docker-android-x86-8.1
+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`

README_GENYMOTION.md

@@ -3,7 +3,7 @@ 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 or as virtual images on AWS, GCP or Alibaba Cloud.
+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
@@ -11,11 +11,12 @@ You can easily scale your Appium tests on Genymotion Android virtual devices in
 	```bash
 	export USER="xxx"
 	export PASS="xxx"
-	export LICENSE="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 -e LICENSE=$LICENSE budtmo/docker-android-genymotion
+	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:
 
@@ -23,4 +24,18 @@ You can easily scale your Appium tests on Genymotion Android virtual devices in
 	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). 

README_JENKINS.md

@@ -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)

devices/profiles/samsung_galaxy_s10.xml

@@ -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>

devices/profiles/samsung_galaxy_s7.xml

@@ -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>

devices/profiles/samsung_galaxy_s7_edge.xml

@@ -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>

devices/profiles/samsung_galaxy_s8.xml

@@ -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>

devices/profiles/samsung_galaxy_s9.xml

@@ -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>

devices/skins/README.md

@@ -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)

devices/skins/samsung_galaxy_s10/.picasa.ini

@@ -0,0 +1,4 @@
+[port-button2.png]
+rotate=rotate(2)
+[port-button3.png]
+rotate=rotate(3)

devices/skins/samsung_galaxy_s10/hardware.ini

@@ -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

devices/skins/samsung_galaxy_s10/layout

@@ -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
+}

devices/skins/samsung_galaxy_s10/manifest.ini

@@ -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

devices/skins/samsung_galaxy_s7/.picasa.ini

@@ -0,0 +1,4 @@
+[port-button2.png]
+rotate=rotate(2)
+[port-button3.png]
+rotate=rotate(3)

devices/skins/samsung_galaxy_s7/hardware.ini

@@ -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

devices/skins/samsung_galaxy_s7/layout

@@ -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
+}

devices/skins/samsung_galaxy_s7/manifest.ini

@@ -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

devices/skins/samsung_galaxy_s7_edge/.picasa.ini

@@ -0,0 +1,4 @@
+[port-button2.png]
+rotate=rotate(2)
+[port-button3.png]
+rotate=rotate(3)

devices/skins/samsung_galaxy_s7_edge/hardware.ini

@@ -0,0 +1,21 @@
+hw.lcd.density = 534
+
+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

devices/skins/samsung_galaxy_s7_edge/layout

@@ -0,0 +1,449 @@
+parts {
+    portrait {
+        background {
+            image   device_Port.png
+        }
+		buttons {
+            back {
+                    image port-button3.png
+                    x 708
+                    y 3146
+            }
+            home {
+                    image port-button2.png
+                    x 1026
+                    y 3124
+            }
+            soft-left {
+                    image port-button1.png
+                    x 1550
+                    y 3146
+            }
+		}	
+    }
+    landscape {
+        background {
+            image   device_Land.png
+        }
+		buttons {
+			soft-left {
+                    image land-button3.png
+                     x 3424
+                     y 1511
+            }
+            home {
+                    image land-button2.png
+                    x 3401
+                    y 983
+            }
+            back {
+                    image land-button1.png
+                     x 3424
+                     y 671
+            }
+		} 
+    }
+
+    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
+}

devices/skins/samsung_galaxy_s7_edge/manifest.ini

@@ -0,0 +1,12 @@
+name=Galaxy_S7_Edge
+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