diff options
| author | Jacob Keeler <jacob.keeler@livioradio.com> | 2016-11-01 14:50:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-01 14:50:40 -0400 |
| commit | ddef86df90c0f33b244419c1a9d7aa36d8a9322b (patch) | |
| tree | d0fe3a2dc5df22bb773f0a71afcca72317e20d26 /src/components/application_manager | |
| parent | 3b8ce0f1028523f5db0b2771a37f8e37b3901ce5 (diff) | |
| parent | 3e541c204628bbcf33a102f2a25b3acb49f3057c (diff) | |
| download | sdl_core-ddef86df90c0f33b244419c1a9d7aa36d8a9322b.tar.gz | |
Merge pull request #928 from smartdevicelink/revert-766-feature/PLAY_PAUSE_implementation
Revert "Inclusion of PLAY_PAUSE as a subscribable button"
Diffstat (limited to 'src/components/application_manager')
4 files changed, 2 insertions, 11 deletions
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")); |