Revert "Inclusion of PLAY_PAUSE as a subscribable button"revert-766-feature/PLAY_PAUSE_implementation

11 files changed, 2 insertions, 29 deletions

diff --git a/src/appMain/hmi_capabilities.json b/src/appMain/hmi_capabilities.json
index 11ac7ccccf..41cf1d3bee 100755
--- a/src/appMain/hmi_capabilities.json
+++ b/src/appMain/hmi_capabilities.json
@@ -422,12 +422,6 @@
 	    		"upDownAvailable"    :true
 	    	},
 	    	{
-	    		"name":"PLAY_PAUSE",
-	    		"shortPressAvailable":true,
-	    		"longPressAvailable" :true,
-	    		"upDownAvailable"    :true
-	    	},
-	    	{
 	    		"name":"SEEKLEFT",
 	    		"shortPressAvailable":true,
 	    		"longPressAvailable" :true,
diff --git a/src/components/application_manager/src/commands/mobile/subscribe_button_request.cc b/src/components/application_manager/src/commands/mobile/subscribe_button_request.cc
index 83121a91bd..eb6bbf545e 100644
--- a/src/components/application_manager/src/commands/mobile/subscribe_button_request.cc
+++ b/src/components/application_manager/src/commands/mobile/subscribe_button_request.cc
@@ -95,8 +95,7 @@ void SubscribeButtonRequest::Run() {
 bool SubscribeButtonRequest::IsSubscriptionAllowed(
     ApplicationSharedPtr app, mobile_apis::ButtonName::eType btn_id) {
   if (!app->is_media_application() &&
-      ((mobile_apis::ButtonName::PLAY_PAUSE == btn_id) ||
-       (mobile_apis::ButtonName::SEEKLEFT == btn_id) ||
+      ((mobile_apis::ButtonName::SEEKLEFT == btn_id) ||
        (mobile_apis::ButtonName::SEEKRIGHT == btn_id) ||
        (mobile_apis::ButtonName::TUNEUP == btn_id) ||
        (mobile_apis::ButtonName::TUNEDOWN == btn_id))) {
diff --git a/src/components/application_manager/src/hmi_capabilities_impl.cc b/src/components/application_manager/src/hmi_capabilities_impl.cc
index d7ffa10178..c6fa321401 100644
--- a/src/components/application_manager/src/hmi_capabilities_impl.cc
+++ b/src/components/application_manager/src/hmi_capabilities_impl.cc
@@ -74,8 +74,6 @@ void InitCapabilities() {
   button_enum_name.insert(
       std::make_pair(std::string("OK"), hmi_apis::Common_ButtonName::OK));
   button_enum_name.insert(std::make_pair(
-      std::string("PLAY_PAUSE"), hmi_apis::Common_ButtonName::PLAY_PAUSE));
-  button_enum_name.insert(std::make_pair(
       std::string("SEEKLEFT"), hmi_apis::Common_ButtonName::SEEKLEFT));
   button_enum_name.insert(std::make_pair(
       std::string("SEEKRIGHT"), hmi_apis::Common_ButtonName::SEEKRIGHT));
diff --git a/src/components/application_manager/test/hmi_capabilities.json b/src/components/application_manager/test/hmi_capabilities.json
index 89524971fe..c174dfcba4 100644
--- a/src/components/application_manager/test/hmi_capabilities.json
+++ b/src/components/application_manager/test/hmi_capabilities.json
@@ -422,12 +422,6 @@
                 "upDownAvailable"    :true
             },
             {
-                "name":"PLAY_PAUSE", 
-                "shortPressAvailable":true,
-                "longPressAvailable" :true,
-                "upDownAvailable"    :true
-            },
-            {
                 "name":"SEEKLEFT",
                 "shortPressAvailable":true,
                 "longPressAvailable" :true,
diff --git a/src/components/application_manager/test/hmi_capabilities_test.cc b/src/components/application_manager/test/hmi_capabilities_test.cc
index 945578f586..738797b122 100644
--- a/src/components/application_manager/test/hmi_capabilities_test.cc
+++ b/src/components/application_manager/test/hmi_capabilities_test.cc
@@ -236,7 +236,7 @@ TEST_F(HMICapabilitiesTest, LoadCapabilitiesFromFile) {
 
   // Count of buttons in json file
   const uint32_t btn_length = buttons_capabilities_so.length();
-  EXPECT_EQ(16u, btn_length);
+  EXPECT_EQ(15u, btn_length);
   for (uint32_t i = 0; i < btn_length; ++i) {
     EXPECT_TRUE((buttons_capabilities_so[i]).keyExists(strings::name));
     EXPECT_TRUE((buttons_capabilities_so[i]).keyExists("shortPressAvailable"));
diff --git a/src/components/interfaces/HMI_API.xml b/src/components/interfaces/HMI_API.xml
index be0b0ad874..022053f96a 100644
--- a/src/components/interfaces/HMI_API.xml
+++ b/src/components/interfaces/HMI_API.xml
@@ -76,7 +76,6 @@
 <enum name="ButtonName">
     <description>Defines the hard (physical) and soft (touchscreen) buttons available from SYNC</description>
     <element name="OK"/>
-    <element name="PLAY_PAUSE"/>
     <element name="SEEKLEFT"/>
     <element name="SEEKRIGHT"/>
     <element name="TUNEUP"/>
diff --git a/src/components/interfaces/Json_HMI_message_specification.txt b/src/components/interfaces/Json_HMI_message_specification.txt
index f464f42351..9f5b20a3c4 100644
--- a/src/components/interfaces/Json_HMI_message_specification.txt
+++ b/src/components/interfaces/Json_HMI_message_specification.txt
@@ -267,13 +267,6 @@ Notifications:
 			
 			{
 				"longPressAvailable" : true,
-				"name" : "PLAY_PAUSE",
-				"shortPressAvailable" : true,
-				"upDownAvailable" : true
-			},
-
-			{
-				"longPressAvailable" : true,
 				"name" : "SEEKLEFT",
 				"shortPressAvailable" : true,
 				"upDownAvailable" : true
diff --git a/src/components/interfaces/MOBILE_API.xml b/src/components/interfaces/MOBILE_API.xml
index 1fd13d489c..d0326ce647 100644
--- a/src/components/interfaces/MOBILE_API.xml
+++ b/src/components/interfaces/MOBILE_API.xml
@@ -489,7 +489,6 @@
   <enum name="ButtonName">

     <description>Defines the hard (physical) and soft (touchscreen) buttons available from SYNC</description>

     <element name="OK" />

-    <element name="PLAY_PAUSE" />

     <element name="SEEKLEFT" />

     <element name="SEEKRIGHT" />

     <element name="TUNEUP" />

diff --git a/src/components/interfaces/QT_HMI_API.xml b/src/components/interfaces/QT_HMI_API.xml
index cc4bd62015..85a4d4143f 100644
--- a/src/components/interfaces/QT_HMI_API.xml
+++ b/src/components/interfaces/QT_HMI_API.xml
@@ -70,7 +70,6 @@
     <enum name="ButtonName">
       <description>Defines the hard (physical) and soft (touchscreen) buttons available from SYNC</description>
       <element name="OK"/>
-      <element name="PLAY_PAUSE"/>
       <element name="SEEKLEFT"/>
       <element name="SEEKRIGHT"/>
       <element name="TUNEUP"/>
diff --git a/src/components/utils/test/test_generator/MOBILE_API.xml b/src/components/utils/test/test_generator/MOBILE_API.xml
index 9642db692e..f5d1c691b7 100644
--- a/src/components/utils/test/test_generator/MOBILE_API.xml
+++ b/src/components/utils/test/test_generator/MOBILE_API.xml
@@ -493,7 +493,6 @@
   <enum name="ButtonName">
     <description>Defines the hard (physical) and soft (touchscreen) buttons available from SYNC</description>
     <element name="OK" />
-    <element name="PLAY_PAUSE" />
     <element name="SEEKLEFT" />
     <element name="SEEKRIGHT" />
     <element name="TUNEUP" />
diff --git a/tools/intergen/test/test_hmi_interface.xml b/tools/intergen/test/test_hmi_interface.xml
index e85060abbb..e091909833 100644
--- a/tools/intergen/test/test_hmi_interface.xml
+++ b/tools/intergen/test/test_hmi_interface.xml
@@ -66,7 +66,6 @@
 <enum name="ButtonName">
     <description>Defines the hard (physical) and soft (touchscreen) buttons available from SYNC</description>
     <element name="OK"/>
-    <element name="PLAY_PAUSE"/>
     <element name="SEEKLEFT"/>
     <element name="SEEKRIGHT"/>
     <element name="TUNEUP"/>