Merge remote-tracking branch 'origin/develop' into feature/PLAY_PAUSE_implementation

# Conflicts:
#	src/appMain/hmi_capabilities.json
#	src/components/application_manager/src/commands/mobile/subscribe_button_request.cc
#	src/components/application_manager/test/hmi_capabilities.json
#	src/components/interfaces/MOBILE_API.xml
#	src/components/interfaces/QT_HMI_API.xml
#	src/components/utils/test/test_generator/MOBILE_API.xml

1 files changed, 0 insertions, 34 deletions

diff --git a/src/components/qt_hmi/References/Work/bananasnacks/qml/Bananas/Layouts/MediaPlayerLayout.qml b/src/components/qt_hmi/References/Work/bananasnacks/qml/Bananas/Layouts/MediaPlayerLayout.qml
deleted file mode 100644
index 797815d058..0000000000
--- a/src/components/qt_hmi/References/Work/bananasnacks/qml/Bananas/Layouts/MediaPlayerLayout.qml
+++ /dev/null
@@ -1,34 +0,0 @@
-import QtQuick 2.0
-import "../Components"
-
-MediaLayout {
-
-    Row {
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 100
-        anchors.left: parent.left
-        anchors.leftMargin: 20
-        spacing: 10
-
-        ImageButton {
-            icon: "../Assets/Rewind.png"
-            onPress: MediaPlayer.previous()
-        }
-
-        ImageButton {
-            icon: "../Assets/Pause.png"
-            visible: MediaPlayer.playing
-            onPress: MediaPlayer.pause()
-        }
-        ImageButton {
-            icon: "../Assets/Play.png"
-            visible: ! MediaPlayer.playing
-            onPress: MediaPlayer.play()
-        }
-        ImageButton {
-            icon: "../Assets/Forward.png"
-            onPress: MediaPlayer.next()
-        }
-
-    }
-}