summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorm.kawonczyk <m.kawonczyk@samsung.com>2017-01-11 16:34:10 +0100
committerHye Kyoung Hwang <cookie@samsung.com>2017-01-19 23:30:05 -0800
commitb72049259a78f01ef2ce7d8162ca4b8d15a2ad11 (patch)
treecf20ab3e5cae05096adb2bcb7c49dac768d6a8e4
parent2cd0abd16a7cb97c32a35814a3db52139eae82c2 (diff)
downloadbrowser-b72049259a78f01ef2ce7d8162ca4b8d15a2ad11.tar.gz
browser-b72049259a78f01ef2ce7d8162ca4b8d15a2ad11.tar.bz2
browser-b72049259a78f01ef2ce7d8162ca4b8d15a2ad11.zip
Disable PWA-specific UI elements
[Issue] N/A [Problem] PWA-specific UI elements where visible for Browser Tizen 3.0 Release. [Solution] Disable those UI elements. [Verify] Open any website with manifest. Press Menu, check if "Add to homescreen" is visible. Go to other website, open same website with manifest again. Repeat 3 times. Check if popup notifying about visiting website 3 times appears. Change-Id: I04fae0688225aae01449490bac6ad2a0a2e73814
-rwxr-xr-xCMakeLists.txt5
-rwxr-xr-xservices/WebPageUI/WebPageUI.cpp4
2 files changed, 9 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86abc8f..c927639 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,6 +29,7 @@ option(TIZEN_BUILD "Build for Tizen. Default ON" ON)
option(DYN_INT_LIBS "Buils internal libs as dynamic" ON)
option(COVERAGE_STATS "Code coverage" OFF)
option(DUMMY_BUTTON "Build With Dummy Button" ON)
+option(PWA "Build with PWA" OFF)
#Enable C++14 support
include(CheckCXXCompilerFlag)
@@ -130,6 +131,10 @@ if(TIZEN_BUILD)
ADD_DEFINITIONS(-DDUMMY_BUTTON=0)
endif()
+ if (${PWA} MATCHES "ON")
+ ADD_DEFINITIONS(-DPWA=1)
+ endif()
+
endif(TIZEN_BUILD)
ADD_DEFINITIONS(-DEDJE_DIR=\"${EDJE_DIR}\")
diff --git a/services/WebPageUI/WebPageUI.cpp b/services/WebPageUI/WebPageUI.cpp
index d53db7b..daeaba8 100755
--- a/services/WebPageUI/WebPageUI.cpp
+++ b/services/WebPageUI/WebPageUI.cpp
@@ -217,7 +217,9 @@ void WebPageUI::loadFinished()
elm_object_focus_set(m_dummy_button, EINA_TRUE);
#endif
+#if PWA
getCountCheckSignal();
+#endif
}
void WebPageUI::setMainContent(Evas_Object* content)
@@ -429,8 +431,10 @@ void WebPageUI::showContextMenu()
return;
}
elm_ctxpopup_item_append(m_ctxpopup, _("IDS_BR_BODY_SETTINGS"), nullptr, _cm_settings_clicked, this);
+#if PWA
if (!m_statesMgr->equals(WPUState::QUICK_ACCESS))
elm_ctxpopup_item_append(m_ctxpopup, "Add to Homescreen", nullptr, _cm_add_to_hs_clicked, this);
+#endif
alignContextMenu(*window);
} else
BROWSER_LOGE("[%s:%d] Signal not found", __PRETTY_FUNCTION__, __LINE__);