Add support for homescreen, and keyboard menu.

Change-Id: I268b906b82b56267e63f53a3b08805ddb36b3bdf

diff --git a/src/MenuBuilder.cpp b/src/MenuBuilder.cpp
index 6f87f6a..1d5c018 100644 (file)
--- a/src/MenuBuilder.cpp
+++ b/src/MenuBuilder.cpp
@@ -643,7 +643,7 @@ MenuBuilderImplementation::MenuBuilderImplementation()
                        recentApps, homeScreen, back, buttonsAndKeys
                }
        }));
-       addToMap("IDS_MENU_MAIN_HOME_APPS", std::make_shared<MenuImplementation>(MenuImplementation {
+       addToMap("IDS_MENU_MAIN_HOME_SCREEN", std::make_shared<MenuImplementation>(MenuImplementation {
                {
                        tap, leftPage, rightPage, emptyItem,
                        gestures, actions, settings, recentApps,

diff --git a/src/SelectActivity.cpp b/src/SelectActivity.cpp
index cd3f329..6e29baa 100644 (file)
--- a/src/SelectActivity.cpp
+++ b/src/SelectActivity.cpp
@@ -407,7 +407,6 @@ std::string SelectActivity::getCompleteLabelOfMenu()
 
 std::string SelectActivity::getCompleteLabelOfMainMenu()
 {
-       //TODO sip, home-apps
        auto phoneCallState = getPhoneCallState();
 
        if (phoneCallState && *phoneCallState == TELEPHONY_CALL_STATE_CONNECTED)
@@ -415,6 +414,12 @@ std::string SelectActivity::getCompleteLabelOfMainMenu()
        if (phoneCallState && *phoneCallState == TELEPHONY_CALL_STATE_CONNECTING)
                return "IDS_MENU_MAIN_INCOMING_CALL";
 
+       if (realUiElement->getApplicationCategory() == UIElement::ApplicationCategory::HOMESCREEN)
+               return "IDS_MENU_MAIN_HOME_SCREEN";
+
+       if (realUiElement->getApplicationCategory() == UIElement::ApplicationCategory::KEYBOARD)
+               return "IDS_MENU_MAIN_SIP";
+
        if (isRealUIElementSlider())
                return "IDS_MENU_MAIN_SLIDER";
 

diff --git a/tests/ui-scenarios/MenuBuilderTests.cpp b/tests/ui-scenarios/MenuBuilderTests.cpp
index 224ad88..f184626 100644 (file)
--- a/tests/ui-scenarios/MenuBuilderTests.cpp
+++ b/tests/ui-scenarios/MenuBuilderTests.cpp
@@ -174,7 +174,7 @@ TEST_F(MenuBuilderTest, testImpactOfContextualMenuVconfValueOnMenuMain)
        eventLoop::run([]() {
                Singleton<VConfInterface>::instance().set(VCONF_KEY_SHOW_CONTEXTUAL_MENU, false);
        });
-       testIfMenuMainIsEqualToNormal("IDS_MENU_MAIN_HOME_APPS");
+       testIfMenuMainIsEqualToNormal("IDS_MENU_MAIN_HOME_SCREEN");
        testIfMenuMainIsEqualToNormal("IDS_MENU_MAIN_SLIDER");
        testIfMenuMainIsEqualToNormal("IDS_MENU_MAIN_EDITABLE_TEXT");
        testIfMenuMainIsEqualToNormal("IDS_MENU_MAIN_SIP");
@@ -198,7 +198,7 @@ TEST_F(MenuBuilderTest, testHidingMenuItems)
 TEST_F(MenuBuilderTest, testContentOfMenuMainHomeApps)
 {
        setMenuKeys(true);
-       testMenuContent("IDS_MENU_MAIN_HOME_APPS", {
+       testMenuContent("IDS_MENU_MAIN_HOME_SCREEN", {
                "IDS_TAP", "IDS_LEFT_PAGE", "IDS_RIGHT_PAGE", "", "IDS_GESTURES", "IDS_ACTIONS", "IDS_SETTINGS",
                "IDS_RECENT_APPS", "IDS_HOME_SCREEN", "IDS_BACK", "IDS_BUTTONS_AND_KEYS"
        });