diff --git a/README.md b/README.md
index 1d519a6..a4eb9fb 100644
--- a/README.md
+++ b/README.md
@@ -59,6 +59,8 @@ List of Devices
Type | Device Name
----- | -----
+Phone | Samsung Galaxy S7 Edge
+Phone | Samsung Galaxy S7
Phone | Samsung Galaxy S6
Phone | Nexus 4
Phone | Nexus 5
diff --git a/devices/profiles/samsung_galaxy_s7.xml b/devices/profiles/samsung_galaxy_s7.xml
new file mode 100644
index 0000000..48b1492
--- /dev/null
+++ b/devices/profiles/samsung_galaxy_s7.xml
@@ -0,0 +1,101 @@
+
+
+
+ Samsung Galaxy S7
+ User
+
+
+
+ large
+ 5.10
+ xxxhdpi
+ long
+
+ 1440
+ 2560
+
+ 575.92
+ 575.92
+
+ jazz-hands
+ finger
+ capacitive
+
+
+
+ Bluetooth
+ Wifi
+ NFC
+
+
+ Accelerometer
+ Barometer
+ Compass
+ GPS
+ Gyroscope
+ LightSensor
+ ProximitySensor
+
+ true
+
+ back
+ true
+ true
+
+
+ front
+ true
+ true
+
+ qwerty
+ nonav
+ 4
+ hard
+
+ 4
+
+
+ Generic CPU
+ Generic GPU
+
+ armeabi-v7a
+ x86
+ x86_64
+
+
+ battery
+
+
+ -
+ true
+
+ 2.0
+
+ false
+
+
+ The device in portrait orientation
+ port
+ keyshidden
+ navhidden
+
+
+ The device in landscape orientation
+ land
+ keyshidden
+ navhidden
+
+
+ The device in portrait orientation with a keyboard open
+ port
+ keysexposed
+ navhidden
+
+
+ The device in landscape orientation with a keyboard open
+ land
+ keysexposed
+ navhidden
+
+
+
diff --git a/devices/profiles/samsung_galaxy_s7_edge.xml b/devices/profiles/samsung_galaxy_s7_edge.xml
new file mode 100644
index 0000000..47dedef
--- /dev/null
+++ b/devices/profiles/samsung_galaxy_s7_edge.xml
@@ -0,0 +1,101 @@
+
+
+
+ Samsung Galaxy S7 Edge
+ User
+
+
+
+ large
+ 5.50
+ xxxhdpi
+ long
+
+ 1440
+ 2560
+
+ 575.92
+ 575.92
+
+ jazz-hands
+ finger
+ capacitive
+
+
+
+ Bluetooth
+ Wifi
+ NFC
+
+
+ Accelerometer
+ Barometer
+ Compass
+ GPS
+ Gyroscope
+ LightSensor
+ ProximitySensor
+
+ true
+
+ back
+ true
+ true
+
+
+ front
+ true
+ true
+
+ qwerty
+ nonav
+ 4
+ hard
+
+ 4
+
+
+ Generic CPU
+ Generic GPU
+
+ armeabi-v7a
+ x86
+ x86_64
+
+
+ battery
+
+
+ -
+ true
+
+ 2.0
+
+ false
+
+
+ The device in portrait orientation
+ port
+ keyshidden
+ navhidden
+
+
+ The device in landscape orientation
+ land
+ keyshidden
+ navhidden
+
+
+ The device in portrait orientation with a keyboard open
+ port
+ keysexposed
+ navhidden
+
+
+ The device in landscape orientation with a keyboard open
+ land
+ keysexposed
+ navhidden
+
+
+
diff --git a/devices/skins/samsung_galaxy_s7/.picasa.ini b/devices/skins/samsung_galaxy_s7/.picasa.ini
new file mode 100644
index 0000000..14efccc
--- /dev/null
+++ b/devices/skins/samsung_galaxy_s7/.picasa.ini
@@ -0,0 +1,4 @@
+[port-button2.png]
+rotate=rotate(2)
+[port-button3.png]
+rotate=rotate(3)
diff --git a/devices/skins/samsung_galaxy_s7/arrow_down.png b/devices/skins/samsung_galaxy_s7/arrow_down.png
new file mode 100644
index 0000000..4c4fd80
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7/arrow_down.png differ
diff --git a/devices/skins/samsung_galaxy_s7/arrow_left.png b/devices/skins/samsung_galaxy_s7/arrow_left.png
new file mode 100644
index 0000000..f687b39
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7/arrow_left.png differ
diff --git a/devices/skins/samsung_galaxy_s7/arrow_right.png b/devices/skins/samsung_galaxy_s7/arrow_right.png
new file mode 100644
index 0000000..a60fde0
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7/arrow_right.png differ
diff --git a/devices/skins/samsung_galaxy_s7/arrow_up.png b/devices/skins/samsung_galaxy_s7/arrow_up.png
new file mode 100644
index 0000000..27e8884
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7/arrow_up.png differ
diff --git a/devices/skins/samsung_galaxy_s7/button.png b/devices/skins/samsung_galaxy_s7/button.png
new file mode 100644
index 0000000..7d3d29e
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7/button.png differ
diff --git a/devices/skins/samsung_galaxy_s7/controls.png b/devices/skins/samsung_galaxy_s7/controls.png
new file mode 100644
index 0000000..94303f8
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7/controls.png differ
diff --git a/devices/skins/samsung_galaxy_s7/device_Land.png b/devices/skins/samsung_galaxy_s7/device_Land.png
new file mode 100644
index 0000000..b638f10
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7/device_Land.png differ
diff --git a/devices/skins/samsung_galaxy_s7/device_Port.png b/devices/skins/samsung_galaxy_s7/device_Port.png
new file mode 100644
index 0000000..c372403
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7/device_Port.png differ
diff --git a/devices/skins/samsung_galaxy_s7/hardware.ini b/devices/skins/samsung_galaxy_s7/hardware.ini
new file mode 100644
index 0000000..816d805
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/devices/skins/samsung_galaxy_s7/key-num.png b/devices/skins/samsung_galaxy_s7/key-num.png
new file mode 100644
index 0000000..e7636c8
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7/key-num.png differ
diff --git a/devices/skins/samsung_galaxy_s7/key.png b/devices/skins/samsung_galaxy_s7/key.png
new file mode 100644
index 0000000..2469f34
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7/key.png differ
diff --git a/devices/skins/samsung_galaxy_s7/key2.png b/devices/skins/samsung_galaxy_s7/key2.png
new file mode 100644
index 0000000..a0a609d
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7/key2.png differ
diff --git a/devices/skins/samsung_galaxy_s7/keyboard.png b/devices/skins/samsung_galaxy_s7/keyboard.png
new file mode 100644
index 0000000..dc9d277
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7/keyboard.png differ
diff --git a/devices/skins/samsung_galaxy_s7/land-button1.png b/devices/skins/samsung_galaxy_s7/land-button1.png
new file mode 100644
index 0000000..d96c1b4
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7/land-button1.png differ
diff --git a/devices/skins/samsung_galaxy_s7/land-button2.png b/devices/skins/samsung_galaxy_s7/land-button2.png
new file mode 100644
index 0000000..bf37b23
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7/land-button2.png differ
diff --git a/devices/skins/samsung_galaxy_s7/land-button3.png b/devices/skins/samsung_galaxy_s7/land-button3.png
new file mode 100644
index 0000000..3c1b3b3
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7/land-button3.png differ
diff --git a/devices/skins/samsung_galaxy_s7/layout b/devices/skins/samsung_galaxy_s7/layout
new file mode 100644
index 0000000..a5cc5c6
--- /dev/null
+++ b/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
+}
diff --git a/devices/skins/samsung_galaxy_s7/manifest.ini b/devices/skins/samsung_galaxy_s7/manifest.ini
new file mode 100644
index 0000000..f04eec4
--- /dev/null
+++ b/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
diff --git a/devices/skins/samsung_galaxy_s7/port-button1.png b/devices/skins/samsung_galaxy_s7/port-button1.png
new file mode 100644
index 0000000..3df9e01
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7/port-button1.png differ
diff --git a/devices/skins/samsung_galaxy_s7/port-button2.png b/devices/skins/samsung_galaxy_s7/port-button2.png
new file mode 100644
index 0000000..ed87113
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7/port-button2.png differ
diff --git a/devices/skins/samsung_galaxy_s7/port-button3.png b/devices/skins/samsung_galaxy_s7/port-button3.png
new file mode 100644
index 0000000..8b5d362
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7/port-button3.png differ
diff --git a/devices/skins/samsung_galaxy_s7/power_l.png b/devices/skins/samsung_galaxy_s7/power_l.png
new file mode 100644
index 0000000..5226106
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7/power_l.png differ
diff --git a/devices/skins/samsung_galaxy_s7/power_p.png b/devices/skins/samsung_galaxy_s7/power_p.png
new file mode 100644
index 0000000..3f180ef
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7/power_p.png differ
diff --git a/devices/skins/samsung_galaxy_s7/select.png b/devices/skins/samsung_galaxy_s7/select.png
new file mode 100644
index 0000000..4083e2f
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7/select.png differ
diff --git a/devices/skins/samsung_galaxy_s7/spacebar.png b/devices/skins/samsung_galaxy_s7/spacebar.png
new file mode 100644
index 0000000..7f6fdeb
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7/spacebar.png differ
diff --git a/devices/skins/samsung_galaxy_s7/volume_down_l.png b/devices/skins/samsung_galaxy_s7/volume_down_l.png
new file mode 100644
index 0000000..53a5765
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7/volume_down_l.png differ
diff --git a/devices/skins/samsung_galaxy_s7/volume_down_p.png b/devices/skins/samsung_galaxy_s7/volume_down_p.png
new file mode 100644
index 0000000..c65cb9e
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7/volume_down_p.png differ
diff --git a/devices/skins/samsung_galaxy_s7/volume_up_l.png b/devices/skins/samsung_galaxy_s7/volume_up_l.png
new file mode 100644
index 0000000..5a1af44
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7/volume_up_l.png differ
diff --git a/devices/skins/samsung_galaxy_s7/volume_up_p.png b/devices/skins/samsung_galaxy_s7/volume_up_p.png
new file mode 100644
index 0000000..2132395
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7/volume_up_p.png differ
diff --git a/devices/skins/samsung_galaxy_s7_edge/.picasa.ini b/devices/skins/samsung_galaxy_s7_edge/.picasa.ini
new file mode 100644
index 0000000..14efccc
--- /dev/null
+++ b/devices/skins/samsung_galaxy_s7_edge/.picasa.ini
@@ -0,0 +1,4 @@
+[port-button2.png]
+rotate=rotate(2)
+[port-button3.png]
+rotate=rotate(3)
diff --git a/devices/skins/samsung_galaxy_s7_edge/arrow_down.png b/devices/skins/samsung_galaxy_s7_edge/arrow_down.png
new file mode 100644
index 0000000..4c4fd80
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7_edge/arrow_down.png differ
diff --git a/devices/skins/samsung_galaxy_s7_edge/arrow_left.png b/devices/skins/samsung_galaxy_s7_edge/arrow_left.png
new file mode 100644
index 0000000..f687b39
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7_edge/arrow_left.png differ
diff --git a/devices/skins/samsung_galaxy_s7_edge/arrow_right.png b/devices/skins/samsung_galaxy_s7_edge/arrow_right.png
new file mode 100644
index 0000000..a60fde0
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7_edge/arrow_right.png differ
diff --git a/devices/skins/samsung_galaxy_s7_edge/arrow_up.png b/devices/skins/samsung_galaxy_s7_edge/arrow_up.png
new file mode 100644
index 0000000..27e8884
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7_edge/arrow_up.png differ
diff --git a/devices/skins/samsung_galaxy_s7_edge/button.png b/devices/skins/samsung_galaxy_s7_edge/button.png
new file mode 100644
index 0000000..7d3d29e
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7_edge/button.png differ
diff --git a/devices/skins/samsung_galaxy_s7_edge/controls.png b/devices/skins/samsung_galaxy_s7_edge/controls.png
new file mode 100644
index 0000000..94303f8
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7_edge/controls.png differ
diff --git a/devices/skins/samsung_galaxy_s7_edge/device_Land.png b/devices/skins/samsung_galaxy_s7_edge/device_Land.png
new file mode 100644
index 0000000..47c7cd5
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7_edge/device_Land.png differ
diff --git a/devices/skins/samsung_galaxy_s7_edge/device_Port.png b/devices/skins/samsung_galaxy_s7_edge/device_Port.png
new file mode 100644
index 0000000..cf4b8d0
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7_edge/device_Port.png differ
diff --git a/devices/skins/samsung_galaxy_s7_edge/hardware.ini b/devices/skins/samsung_galaxy_s7_edge/hardware.ini
new file mode 100644
index 0000000..353fe6e
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/devices/skins/samsung_galaxy_s7_edge/key-num.png b/devices/skins/samsung_galaxy_s7_edge/key-num.png
new file mode 100644
index 0000000..e7636c8
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7_edge/key-num.png differ
diff --git a/devices/skins/samsung_galaxy_s7_edge/key.png b/devices/skins/samsung_galaxy_s7_edge/key.png
new file mode 100644
index 0000000..2469f34
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7_edge/key.png differ
diff --git a/devices/skins/samsung_galaxy_s7_edge/key2.png b/devices/skins/samsung_galaxy_s7_edge/key2.png
new file mode 100644
index 0000000..a0a609d
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7_edge/key2.png differ
diff --git a/devices/skins/samsung_galaxy_s7_edge/keyboard.png b/devices/skins/samsung_galaxy_s7_edge/keyboard.png
new file mode 100644
index 0000000..dc9d277
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7_edge/keyboard.png differ
diff --git a/devices/skins/samsung_galaxy_s7_edge/land-button1.png b/devices/skins/samsung_galaxy_s7_edge/land-button1.png
new file mode 100644
index 0000000..03c580e
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7_edge/land-button1.png differ
diff --git a/devices/skins/samsung_galaxy_s7_edge/land-button2.png b/devices/skins/samsung_galaxy_s7_edge/land-button2.png
new file mode 100644
index 0000000..1105274
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7_edge/land-button2.png differ
diff --git a/devices/skins/samsung_galaxy_s7_edge/land-button3.png b/devices/skins/samsung_galaxy_s7_edge/land-button3.png
new file mode 100644
index 0000000..957bccc
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7_edge/land-button3.png differ
diff --git a/devices/skins/samsung_galaxy_s7_edge/layout b/devices/skins/samsung_galaxy_s7_edge/layout
new file mode 100644
index 0000000..76d10b8
--- /dev/null
+++ b/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
+}
diff --git a/devices/skins/samsung_galaxy_s7_edge/manifest.ini b/devices/skins/samsung_galaxy_s7_edge/manifest.ini
new file mode 100644
index 0000000..8804919
--- /dev/null
+++ b/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
diff --git a/devices/skins/samsung_galaxy_s7_edge/port-button1.png b/devices/skins/samsung_galaxy_s7_edge/port-button1.png
new file mode 100644
index 0000000..ba367c2
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7_edge/port-button1.png differ
diff --git a/devices/skins/samsung_galaxy_s7_edge/port-button2.png b/devices/skins/samsung_galaxy_s7_edge/port-button2.png
new file mode 100644
index 0000000..3e7e9b4
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7_edge/port-button2.png differ
diff --git a/devices/skins/samsung_galaxy_s7_edge/port-button3.png b/devices/skins/samsung_galaxy_s7_edge/port-button3.png
new file mode 100644
index 0000000..92415da
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7_edge/port-button3.png differ
diff --git a/devices/skins/samsung_galaxy_s7_edge/power_l.png b/devices/skins/samsung_galaxy_s7_edge/power_l.png
new file mode 100644
index 0000000..5226106
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7_edge/power_l.png differ
diff --git a/devices/skins/samsung_galaxy_s7_edge/power_p.png b/devices/skins/samsung_galaxy_s7_edge/power_p.png
new file mode 100644
index 0000000..3f180ef
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7_edge/power_p.png differ
diff --git a/devices/skins/samsung_galaxy_s7_edge/select.png b/devices/skins/samsung_galaxy_s7_edge/select.png
new file mode 100644
index 0000000..4083e2f
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7_edge/select.png differ
diff --git a/devices/skins/samsung_galaxy_s7_edge/spacebar.png b/devices/skins/samsung_galaxy_s7_edge/spacebar.png
new file mode 100644
index 0000000..7f6fdeb
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7_edge/spacebar.png differ
diff --git a/devices/skins/samsung_galaxy_s7_edge/volume_down_l.png b/devices/skins/samsung_galaxy_s7_edge/volume_down_l.png
new file mode 100644
index 0000000..53a5765
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7_edge/volume_down_l.png differ
diff --git a/devices/skins/samsung_galaxy_s7_edge/volume_down_p.png b/devices/skins/samsung_galaxy_s7_edge/volume_down_p.png
new file mode 100644
index 0000000..c65cb9e
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7_edge/volume_down_p.png differ
diff --git a/devices/skins/samsung_galaxy_s7_edge/volume_up_l.png b/devices/skins/samsung_galaxy_s7_edge/volume_up_l.png
new file mode 100644
index 0000000..5a1af44
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7_edge/volume_up_l.png differ
diff --git a/devices/skins/samsung_galaxy_s7_edge/volume_up_p.png b/devices/skins/samsung_galaxy_s7_edge/volume_up_p.png
new file mode 100644
index 0000000..2132395
Binary files /dev/null and b/devices/skins/samsung_galaxy_s7_edge/volume_up_p.png differ