From: Sunghyun Kim Date: Fri, 3 Jul 2020 08:11:57 +0000 (+0900) Subject: [TBT][widget-viewer-dali][ACR-1567][Delete Testcase for widget-viewer-dali] X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7e9e9ff36428dbff300c3d5477aeb236c7405147;p=test%2Ftct%2Fnative%2Fbehavior.git [TBT][widget-viewer-dali][ACR-1567][Delete Testcase for widget-viewer-dali] WidgetView and WidgetViewManager will be deprecated. so TestCase also need to be deleted. Change-Id: I1772c88058c3cf16350c37df850e0f3f717dc6f0 --- diff --git a/coretbtwidgetapp-dali/.cproject b/coretbtwidgetapp-dali/.cproject deleted file mode 100644 index 3616203..0000000 --- a/coretbtwidgetapp-dali/.cproject +++ /dev/null @@ -1,616 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/coretbtwidgetapp-dali/.exportMap b/coretbtwidgetapp-dali/.exportMap deleted file mode 100644 index 43e310e..0000000 --- a/coretbtwidgetapp-dali/.exportMap +++ /dev/null @@ -1,4 +0,0 @@ -{ - global: main; - local: *; -}; diff --git a/coretbtwidgetapp-dali/.gbs.conf b/coretbtwidgetapp-dali/.gbs.conf deleted file mode 100644 index 5a50939..0000000 --- a/coretbtwidgetapp-dali/.gbs.conf +++ /dev/null @@ -1,30 +0,0 @@ -[general] -buildroot=~/GBS-ROOT-TBT-MOBILE -profile = profile.device - -[profile.device] # Profile for Device -obs = obs.device -repos = repo.device - -[profile.sdk] # Profile for SDK -obs = obs.sdk -repos = repo.sdk - -[obs.device] # obs for SDK.Ref_Target -#OBS API URL pointing to a remote OBS. -url = https://168.219.209.58/ - -[obs.sdk] # obs for SDK.Emulator -#OBS API URL pointing to a remote OBS. -url = https://168.219.209.58/ - - -#device -[repo.device] # Repository for Tizen 2.4 SDK Target snapshot -url = http://download.tizen.org/snapshots/tizen/mobile/latest/repos/arm64-wayland/packages/ - -#SDK -[repo.sdk] # Repository for Tizen 2.4 SDK Emulator snapshot -url = http://download.tizen.org/snapshots/tizen/mobile/latest/repos/arm64-wayland/packages/ - - diff --git a/coretbtwidgetapp-dali/.gitignore b/coretbtwidgetapp-dali/.gitignore deleted file mode 100644 index 9cd49f2..0000000 --- a/coretbtwidgetapp-dali/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/Debug -/SA_Report -/res diff --git a/coretbtwidgetapp-dali/.package-stamp b/coretbtwidgetapp-dali/.package-stamp deleted file mode 100644 index 40cbe59..0000000 --- a/coretbtwidgetapp-dali/.package-stamp +++ /dev/null @@ -1 +0,0 @@ -TPK \ No newline at end of file diff --git a/coretbtwidgetapp-dali/.project b/coretbtwidgetapp-dali/.project deleted file mode 100644 index 7cf1b46..0000000 --- a/coretbtwidgetapp-dali/.project +++ /dev/null @@ -1,32 +0,0 @@ - - - coretbtwidgetapp - - - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - org.tizen.nativecore.apichecker.core.builder - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - org.tizen.nativecore.apichecker.core.tizenCppNature - - diff --git a/coretbtwidgetapp-dali/.rds_delta b/coretbtwidgetapp-dali/.rds_delta deleted file mode 100644 index b923a0e..0000000 --- a/coretbtwidgetapp-dali/.rds_delta +++ /dev/null @@ -1,9 +0,0 @@ -#delete -#add -#modify -author-signature.xml -signature1.xml -bin/coretbtwidgetapp -shared/res/icon.png -shared/res/preview.png -tizen-manifest.xml diff --git a/coretbtwidgetapp-dali/.sdk_delta.info b/coretbtwidgetapp-dali/.sdk_delta.info deleted file mode 100644 index ef32173..0000000 Binary files a/coretbtwidgetapp-dali/.sdk_delta.info and /dev/null differ diff --git a/coretbtwidgetapp-dali/.tproject b/coretbtwidgetapp-dali/.tproject deleted file mode 100644 index 658e81b..0000000 --- a/coretbtwidgetapp-dali/.tproject +++ /dev/null @@ -1,12 +0,0 @@ - - - - - mobile-5.0 - - - - - - - diff --git a/coretbtwidgetapp-dali/CMakeLists_not.txt b/coretbtwidgetapp-dali/CMakeLists_not.txt deleted file mode 100755 index a3be864..0000000 --- a/coretbtwidgetapp-dali/CMakeLists_not.txt +++ /dev/null @@ -1,64 +0,0 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 2.8) -PROJECT(${NAME} CXX) - -SET(project_name ${NAME}) -SET(PREFIX ${CMAKE_INSTALL_PREFIX}) - - -SET(PKG_MODULES - appcore-efl - aul - bundle - capi-appfw-application - capi-appfw-widget-application - capi-system-info - dlog - dlog - ecore - ecore-evas - edje - efl-extension - eina - elementary - evas - glib-2.0 -) - -INCLUDE(FindPkgConfig) -pkg_check_modules(${project_name} REQUIRED ${PKG_MODULES}) - -INCLUDE_DIRECTORIES( - ${${project_name}_INCLUDE_DIRS} - ${CMAKE_CURRENT_SOURCE_DIR}/inc -) - -FILE(GLOB_RECURSE SRCS ${CMAKE_SOURCE_DIR}/src/*.cpp) -ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS}) -TARGET_LINK_LIBRARIES(${PROJECT_NAME} - capi-appfw-app-common - capi-appfw-app-control - capi-appfw-application - capi-appfw-widget-application - capi-system-info - dlog - ecore - edje - efl-extension - eina - elementary - evas -) - - -CONFIGURE_FILE(tizen-manifest.xml ${PACKAGE_NAME}.xml) - -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR}) -install(FILES ${CMAKE_SOURCE_DIR}/${PACKAGE_NAME}.xml DESTINATION /opt/share/packages) -install(FILES ${CMAKE_SOURCE_DIR}/shared/res/${DESKTOP_ICON} DESTINATION /opt/share/icons/default/small) -install(FILES ${CMAKE_SOURCE_DIR}/shared/res/${DESKTOP_ICON} DESTINATION /opt/usr/apps/${PACKAGE_NAME}/shared/res) - -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -Wall -fPIC -pipe -Wl,--allow-shlib-undefined -D__DEBUG_MSG__") -#SET(CMAKE_C_FLAGS " -fPIE -Wall -lstdc++") -SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib -pie") - - diff --git a/coretbtwidgetapp-dali/inc/tbt-widget/tbt-widget-impl.h b/coretbtwidgetapp-dali/inc/tbt-widget/tbt-widget-impl.h deleted file mode 100644 index c75bbd2..0000000 --- a/coretbtwidgetapp-dali/inc/tbt-widget/tbt-widget-impl.h +++ /dev/null @@ -1,63 +0,0 @@ -#ifndef __DALI_INTERNAL_TBT_WIDGET_H__ -#define __DALI_INTERNAL_TBT_WIDGET_H__ - -/* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -// EXTERNAL INCLUDES -#include -#include "../../inc/tbt-widget/tbt-widget.h" - -namespace TBT -{ - -namespace Internal -{ - -class TBTWidget : public Dali::Internal::Adaptor::Widget -{ -public: - - TBTWidget(); - - ~TBTWidget(); - - static TBT::TBTWidget New(); - - virtual void OnCreate( const std::string& contentInfo, Dali::Window window ); - - virtual void OnTerminate( const std::string& contentInfo, Dali::Widget::Termination type ); - - virtual void OnPause(); - - virtual void OnResume(); - - virtual void OnResize( Dali::Window window ); - - virtual void OnUpdate( const std::string& contentInfo, int force ); - -protected: - - // Undefined - TBTWidget(const TBTWidget&); - TBTWidget& operator=(TBTWidget&); -}; - -} // namespace Internal - -} // namespace Dali -#endif // __DALI_INTERNAL_TBT_WIDGET_H__ diff --git a/coretbtwidgetapp-dali/inc/tbt-widget/tbt-widget.h b/coretbtwidgetapp-dali/inc/tbt-widget/tbt-widget.h deleted file mode 100644 index d0aba69..0000000 --- a/coretbtwidgetapp-dali/inc/tbt-widget/tbt-widget.h +++ /dev/null @@ -1,51 +0,0 @@ -#ifndef __DALI_TBT_WIDGET_H__ -#define __DALI_TBT_WIDGET_H__ - -/* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include - -namespace TBT -{ - -namespace Internal -{ -class TBTWidget; -} - -class TBTWidget : public Dali::Widget -{ -public: - - TBTWidget(); - - static TBTWidget New(); - - ~TBTWidget(); - - TBTWidget( const TBTWidget& tbtWidget ); - - TBTWidget& operator=( const TBTWidget& tbtWidget ); - -public: - explicit TBTWidget( Internal::TBTWidget* tbtWidget ); - -}; - -} -#endif // ___DALI_TBT_WIDGET_H__ diff --git a/coretbtwidgetapp-dali/packaging/org.tizen.coretbtwidgetapp-dali.spec b/coretbtwidgetapp-dali/packaging/org.tizen.coretbtwidgetapp-dali.spec deleted file mode 100755 index 694a46e..0000000 --- a/coretbtwidgetapp-dali/packaging/org.tizen.coretbtwidgetapp-dali.spec +++ /dev/null @@ -1,98 +0,0 @@ -Name: org.tizen.coretbtwidgetapp-dali -Version: 0.0.1 -Release: 1 -License: To be filled -Summary: TBT GBS -Group: System/Libraries -Source0: %{name}-%{version}.tar.gz - -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig -BuildRequires: cmake -BuildRequires: edje-tools -BuildRequires: efl-assist-devel -BuildRequires: gettext-tools -BuildRequires: hash-signer -BuildRequires: pkgconfig(accounts-svc) -BuildRequires: pkgconfig(appcore-common) -BuildRequires: pkgconfig(appcore-efl) -BuildRequires: pkgconfig(appsvc) -BuildRequires: pkgconfig(badge) -BuildRequires: pkgconfig(bundle) -BuildRequires: pkgconfig(capi-appfw-app-control) -BuildRequires: pkgconfig(capi-appfw-package-manager) -BuildRequires: pkgconfig(capi-appfw-widget-application) -BuildRequires: pkgconfig(capi-base-common) -BuildRequires: pkgconfig(capi-message-port) -BuildRequires: pkgconfig(capi-messaging-messages) -BuildRequires: pkgconfig(db-util) -BuildRequires: pkgconfig(dbus-glib-1) -BuildRequires: pkgconfig(deviced) -BuildRequires: pkgconfig(dlog) -BuildRequires: pkgconfig(ecore-evas) -BuildRequires: pkgconfig(ecore) -BuildRequires: pkgconfig(edje) -BuildRequires: pkgconfig(efl-extension) -BuildRequires: pkgconfig(embryo) -BuildRequires: pkgconfig(evas) -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gobject-2.0) - - -%description -Platform Project - -%define _shortname coretbtwidgetapp-dali -%define _optdir /opt -%define _usrdir /opt/usr -%define _appdir /opt/usr/apps -%define _pkgdir %{_appdir}/%{name} -%define _bindir %{_pkgdir}/bin -%define _libdir %{_pkgdir}/lib -%define _resdir %{_pkgdir}/res -%define _shareddir %{_pkgdir}/shared -%define _sharedreddir %{_pkgdir}/shared/res -%define _manifestdir /opt/share/packages -%define _desktopicondir /opt/share/icons/default/small -%define _desktopicon %{_shortname}.png - -%prep -%setup -q - -%build -cmake \ - -DCMAKE_INSTALL_PREFIX=%{_pkgdir} \ - -DPACKAGE_NAME=%{name} \ - -DBINDIR=%{_bindir} \ - -DLIBDIR=%{_libdir} \ - -DRESDIR=%{_resdir} \ - -DMANIFESTDIR=%{_manifestdir} \ - -DSHAREDDIR=%{_sharedreddir} \ - -DDESKTOP_ICONDIR=%{_desktopicondir} \ - -DDESKTOP_ICON=%{_desktopicon} \ - -DNAME=%{_shortname} \ - -DVERSION=%{version} \ - -DCMAKE_BUILD_TYPE=%{BUILD_TYPE} \ - -make %{?jobs:-j%jobs} - -%install -%make_install -mkdir -p %{buildroot}%{_appdir}/%{name} -%clean -rm -rf %{buildroot} - -%post -chown -R 5000:5000 %{_resdir} -chsmack -a %{name} %{_resdir} -%postun - -%files -%{_manifestdir}/%{name}.xml -%{_desktopicondir}/%{_desktopicon} -%{_sharedreddir}/%{_desktopicon} -%{_bindir}/%{_shortname} - - - - diff --git a/coretbtwidgetapp-dali/shared/res/coretbtwidgetapp.png b/coretbtwidgetapp-dali/shared/res/coretbtwidgetapp.png deleted file mode 100644 index 9765b1b..0000000 Binary files a/coretbtwidgetapp-dali/shared/res/coretbtwidgetapp.png and /dev/null differ diff --git a/coretbtwidgetapp-dali/shared/res/icon.png b/coretbtwidgetapp-dali/shared/res/icon.png deleted file mode 100644 index 9765b1b..0000000 Binary files a/coretbtwidgetapp-dali/shared/res/icon.png and /dev/null differ diff --git a/coretbtwidgetapp-dali/shared/res/preview.png b/coretbtwidgetapp-dali/shared/res/preview.png deleted file mode 100644 index acf5670..0000000 Binary files a/coretbtwidgetapp-dali/shared/res/preview.png and /dev/null differ diff --git a/coretbtwidgetapp-dali/src/hello-world-example.cpp b/coretbtwidgetapp-dali/src/hello-world-example.cpp deleted file mode 100644 index 58e3945..0000000 --- a/coretbtwidgetapp-dali/src/hello-world-example.cpp +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include <../inc/tbt-widget/tbt-widget.h> - -using namespace Dali; - -// This example shows how to create and display Hello World! using a simple TextActor -// -class HelloWorldController : public ConnectionTracker -{ -public: - - HelloWorldController( WidgetApplication& application ) - : mApplication( application ) - { - // Connect to the Application's Init signal - mApplication.InitSignal().Connect( this, &HelloWorldController::Create ); - } - - ~HelloWorldController() - { - // Nothing to do here; - } - - // The Init signal is received once (only) during the Application lifetime - void Create( Application& application ) - { - mApplication.RegisterWidgetCreatingFunction("org.tizen.coretbtwidgetapp-dali", CustomWidgetCreatingFunction); - } - - static Widget CustomWidgetCreatingFunction(const std::string& widgetName) - { - TBT::TBTWidget tbtWidget = TBT::TBTWidget::New(); - return tbtWidget; - } - - bool OnTouch( Actor actor, const TouchData& touch ) - { - // quit the application - mApplication.Quit(); - return true; - } - -private: - WidgetApplication& mApplication; -}; - -int DALI_EXPORT_API main( int argc, char **argv ) -{ - WidgetApplication application = WidgetApplication::New( &argc, &argv,"" ); - HelloWorldController test( application ); - application.MainLoop(); - return 0; -} diff --git a/coretbtwidgetapp-dali/src/tbt-widget/tbt-widget-impl.cpp b/coretbtwidgetapp-dali/src/tbt-widget/tbt-widget-impl.cpp deleted file mode 100644 index a69fdc7..0000000 --- a/coretbtwidgetapp-dali/src/tbt-widget/tbt-widget-impl.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -// CLASS HEADER -#include -#include "../../inc/tbt-widget/tbt-widget-impl.h" - -using namespace Dali; -using namespace Dali::Toolkit; - -namespace TBT -{ - -namespace Internal -{ - -TBT::TBTWidget TBTWidget::New() -{ - IntrusivePtr impl = new TBTWidget(); - TBT::TBTWidget handle = TBT::TBTWidget( impl.Get() ); - return handle; -} - -TBTWidget::TBTWidget() -{ -} - -TBTWidget::~TBTWidget() -{ -} - - -void TBTWidget::OnCreate( const std::string& contentInfo, Dali::Window window ) -{ - Stage::GetCurrent().SetBackgroundColor(Color::WHITE); - TextLabel label = TextLabel::New("Hello world!"); - label.SetPosition(0,0); - label.SetSize(Stage::GetCurrent().GetSize()); - label.SetProperty(TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER"); - label.SetProperty(TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER"); - label.SetAnchorPoint(AnchorPoint::TOP_LEFT); - Stage::GetCurrent().Add( label ); -} - -void TBTWidget::OnTerminate( const std::string& contentInfo, Dali::Widget::Termination type ) -{ -} - -void TBTWidget::OnPause() -{ -} - -void TBTWidget::OnResume() -{ -} - -void TBTWidget::OnResize( Dali::Window window ) -{ -} - -void TBTWidget::OnUpdate( const std::string& contentInfo, int force ) -{ -} - -} // Internal - -} // Dali diff --git a/coretbtwidgetapp-dali/src/tbt-widget/tbt-widget.cpp b/coretbtwidgetapp-dali/src/tbt-widget/tbt-widget.cpp deleted file mode 100644 index f7e6238..0000000 --- a/coretbtwidgetapp-dali/src/tbt-widget/tbt-widget.cpp +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include "../../inc/tbt-widget/tbt-widget.h" -#include "../../inc/tbt-widget/tbt-widget-impl.h" - -namespace TBT -{ - -TBTWidget::TBTWidget() -{ -} - -TBTWidget TBTWidget::New() -{ - return Internal::TBTWidget::New(); -} - -TBTWidget::~TBTWidget() -{ -} - - -TBTWidget::TBTWidget(const TBTWidget& tbtWidget) -: Dali::Widget(tbtWidget) -{ -} - -TBTWidget& TBTWidget::operator=(const TBTWidget& tbtWidget) -{ - if( *this != tbtWidget ) - { - Dali::Widget::operator=( tbtWidget ); - } - return *this; -} - -TBTWidget::TBTWidget( Internal::TBTWidget* tbtWidget ) -: Dali::Widget( tbtWidget ) -{ -} - -} // namespace Dali diff --git a/coretbtwidgetapp-dali/tizen-manifest.xml b/coretbtwidgetapp-dali/tizen-manifest.xml deleted file mode 100644 index 478972f..0000000 --- a/coretbtwidgetapp-dali/tizen-manifest.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - icon.png - 2x2 - - true - diff --git a/release/binary-armv7l/install.sh b/release/binary-armv7l/install.sh index e1b9889..fef8262 100755 --- a/release/binary-armv7l/install.sh +++ b/release/binary-armv7l/install.sh @@ -39,8 +39,6 @@ sdb push org.tizen.tbtcoreapp-1.0.0-arm.tpk /tmp sdb push org.tizen.tbt_pushtestapp-1.0.0-arm.tpk /tmp sdb push org.example.multiclass-1.0.0-arm.tpk /tmp sdb push org.example.widget-1.0.0-arm.tpk /tmp -sdb push org.tizen.coretbtwidgetapp-dali-1.0.0-arm.tpk /tmp -sdb push org.tizen.tbtcoreapp-widget-new-dali-1.0.0-arm.tpk /tmp sdb shell "mount -o remount,rw /" sdb push org.tizen.autofill-service-1.0.7-1.armv7l.rpm /tmp @@ -65,8 +63,6 @@ sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.tbtcoreapp-dali-1.0.0-arm.tp sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.tbt_pushtestapp-1.0.0-arm.tpk" $EXECUTION_USER sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.example.multiclass-1.0.0-arm.tpk" $EXECUTION_USER sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.example.widget-1.0.0-arm.tpk" $EXECUTION_USER -sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.coretbtwidgetapp-dali-1.0.0-arm.tpk" $EXECUTION_USER -sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.tbtcoreapp-widget-new-dali-1.0.0-arm.tpk" $EXECUTION_USER sdb push dog_1024_960.gif /home/$EXECUTION_USER/media/Images sdb push SampleMP3.mp3 /home/$EXECUTION_USER/media/Sounds diff --git a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk index 680617f..c2505f7 100755 Binary files a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk and b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk differ diff --git a/release/binary-armv7l/org.tizen.tbtcoreapp-dali-1.0.0-arm.tpk b/release/binary-armv7l/org.tizen.tbtcoreapp-dali-1.0.0-arm.tpk index 4fbe02c..cc4f0d6 100755 Binary files a/release/binary-armv7l/org.tizen.tbtcoreapp-dali-1.0.0-arm.tpk and b/release/binary-armv7l/org.tizen.tbtcoreapp-dali-1.0.0-arm.tpk differ diff --git a/release/binary-x86/install.sh b/release/binary-x86/install.sh index a14ba92..4479bcf 100755 --- a/release/binary-x86/install.sh +++ b/release/binary-x86/install.sh @@ -38,8 +38,6 @@ sdb push org.tizen.tbtcoreapp-1.0.0-x86.tpk /tmp sdb push org.tizen.tbt_pushtestapp-1.0.0-x86.tpk /tmp sdb push org.example.widget-1.0.0-x86.tpk /tmp sdb push org.example.multiclass-1.0.0-x86.tpk /tmp -sdb push org.tizen.coretbtwidgetapp-dali-1.0.0-x86.tpk /tmp -sdb push org.tizen.tbtcoreapp-widget-new-dali-1.0.0-x86.tpk /tmp sdb shell "mount -o remount,rw /" sdb push org.tizen.autofill-service-1.0.7-1.i686.rpm /tmp @@ -56,8 +54,6 @@ sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.tbtcoreapp-dali-1.0.0-x86.tp sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.tbt_pushtestapp-1.0.0-x86.tpk" $EXECUTION_USER sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.example.widget-1.0.0-x86.tpk" $EXECUTION_USER sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.example.multiclass-1.0.0-x86.tpk" $EXECUTION_USER -sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.coretbtwidgetapp-dali-1.0.0-x86.tpk" $EXECUTION_USER -sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.tbtcoreapp-widget-new-dali-1.0.0-x86.tpk" $EXECUTION_USER sdb push dog_1024_960.gif /home/$EXECUTION_USER/media/Images sdb push SampleMP3.mp3 /home/$EXECUTION_USER/media/Sounds diff --git a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk index 5c31e68..9e9cefc 100755 Binary files a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk differ diff --git a/release/binary-x86/org.tizen.tbtcoreapp-dali-1.0.0-x86.tpk b/release/binary-x86/org.tizen.tbtcoreapp-dali-1.0.0-x86.tpk index 0af2486..896a339 100755 Binary files a/release/binary-x86/org.tizen.tbtcoreapp-dali-1.0.0-x86.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-dali-1.0.0-x86.tpk differ diff --git a/scripts_tpk/tpkbuild.sh b/scripts_tpk/tpkbuild.sh index 58f7414..237cf85 100755 --- a/scripts_tpk/tpkbuild.sh +++ b/scripts_tpk/tpkbuild.sh @@ -131,7 +131,7 @@ elif [ "$ARCH_TYPE" == "aarch64" ]; then elif [ "$ARCH_TYPE" == "x86_64" ]; then ARCH="x86_64" fi -modulearray=(org.tizen.coretbt_dataprovider org.tizen.coretbt_uiapp org.tizen.operationpickviewapp org.tizen.coretbtwidgetapp org.tizen.tbtcoreapp org.tizen.tbt-ime org.tizen.tbtcoreapp-dali org.tizen.tbt_pushtestapp org.example.multiclass org.tizen.coretbtwidgetapp-dali org.tizen.tbtcoreapp-widget-new-dali) +modulearray=(org.tizen.coretbt_dataprovider org.tizen.coretbt_uiapp org.tizen.operationpickviewapp org.tizen.coretbtwidgetapp org.tizen.tbtcoreapp org.tizen.tbt-ime org.tizen.tbtcoreapp-dali org.tizen.tbt_pushtestapp org.example.multiclass) echo $TC_TYPE echo $MOD_NAME sdb root on diff --git a/tbtcoreapp-dali/inc/view/tbt-dali-widget-view.h b/tbtcoreapp-dali/inc/view/tbt-dali-widget-view.h deleted file mode 100644 index de9dae6..0000000 --- a/tbtcoreapp-dali/inc/view/tbt-dali-widget-view.h +++ /dev/null @@ -1,73 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - *******************************************************************************/ -/** - * @file tbt-dali-widget-view.h - * @brief To test functionality of dali widget - * - * @author Jahangir Alam(ja.alam@samsung.com) - * @date December, 2016 - * @credit - * - */ - - -#ifndef __TBT_MODULE_APP_DALI_WIDGET -#define __TBT_MODULE_APP_DALI_WIDGET -#include - -#include "utils/logger.h" -#include "utils/config.h" -#include "utils/ui-utils.h" -#include "utils/dali-ui-utils.h" -// widget viewer_dali -#include - -class TBTDaliWidgetView: public UiUtils { - -private: - - TableView mTableView; - TextLabel lblWidgetAdded; - TextLabel lblWidgetCreationAbortedSignal; - TextLabel lblWidgetContentUpdatedSignal; - TextLabel lblWidgetFaultedSignal; - - PushButton btnActivate; - PushButton btnPause; - PushButton btnResume; - PushButton btnCancel; - PushButton btnLaunchWidget; - - WidgetView::WidgetViewManager mWidgetViewManager; - WidgetView::WidgetView mWidgetView; - WidgetView::WidgetView mWidgetView_1; - bool mWidgetLaunched; - -public: - TBTDaliWidgetView(Application& mApplication, app_control_h _control); - - void onWidgetCreationAbortedSignal(WidgetView::WidgetView widgetView); - void onWidgetContentUpdatedSignal(WidgetView::WidgetView widgetView); - void onWidgetFaultedSignal(WidgetView::WidgetView widgetView); - - bool OnButtonClicked( Button button ); - - void OnWidgetAdded( WidgetView::WidgetView widgetView ); - void OnWidgetDeleted( WidgetView::WidgetView widgetView ); -}; - -#endif // __TBT_MODULE_APP_DALI_WIDGET - diff --git a/tbtcoreapp-dali/src/tbtcoreapp-dali.cpp b/tbtcoreapp-dali/src/tbtcoreapp-dali.cpp index 362a567..2c676ee 100644 --- a/tbtcoreapp-dali/src/tbtcoreapp-dali.cpp +++ b/tbtcoreapp-dali/src/tbtcoreapp-dali.cpp @@ -52,7 +52,6 @@ #include "view/tbt-dali-tap-gesture-multiple-view.h" #include "view/tbt-dali-style-manager-view.h" #include "view/tbt-dali-app-view.h" -#include "view/tbt-dali-widget-view.h" using namespace Dali; using namespace Dali::Toolkit; @@ -206,10 +205,6 @@ public: { parentView = new TBTDaliAppView(mApplication, _control); } - else if(strcmp(moduleName, "TBT_APP_DALI_WIDGET") == 0) - { - parentView = new TBTDaliWidgetView(mApplication, _control); - } } } diff --git a/tbtcoreapp-dali/src/view/tbt-dali-widget-view.cpp b/tbtcoreapp-dali/src/view/tbt-dali-widget-view.cpp deleted file mode 100644 index a13cc74..0000000 --- a/tbtcoreapp-dali/src/view/tbt-dali-widget-view.cpp +++ /dev/null @@ -1,237 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - *******************************************************************************/ -/** - * @file tbt-dali-widget-view.cpp - * @brief To test functionality of dali widget - * - * @author Jahangir Alam(ja.alam@samsung.com) - * @date December, 2016 - * @credit - * - */ - -#include "view/tbt-dali-widget-view.h" - - -const Vector4 selectedRedColor=Vector4(0.9f, 0.55f, 0.55f, 1.0f); -const Vector4 unSelectedRedColor=Vector4(0.9f, 0.8f, 0.8f, 1.0f); - -TBTDaliWidgetView::TBTDaliWidgetView(Application& mApplication, app_control_h _control) : - UiUtils(mApplication, _control) { - - Init("DALi widget"); - mInfoText=std::string("")+ - "\nTo perform the test:" - "\n1. Run DALi Widget View." - "\n2. Click on launch button for launch WidgetView." - "\n3. Widget added signal will call after successfully launch widget on screen" - "\n4. Widget creation aborted signal will call after perform click on activate button" - "\n5. Pause/Resume button are perform widget pause/resume respectively." - "\n6. Cancel button un-set the widget touch event." - "\n7. If the corresponding event signals mgs " - "are changed then press Pass. " - "Otherwise, press Fail"; - - Stage stage = Stage::GetCurrent(); - mWidgetLaunched = false; - - mTableView=TableView::New(16,4); - mTableView.SetAnchorPoint(AnchorPoint::TOP_LEFT); - mTableView.SetParentOrigin(ParentOrigin::TOP_LEFT); - mTableView.SetSize(bodySize.width, bodySize.height-(3*TEXTLABEL_HEIGHT * bodySize.height + this->footerSize.height)); - mTableView.SetPosition(0.0f, 0.0f); - this->ctlBody.Add(mTableView); - - Property::Map ctl; - Property::Map size; - - ctl["lbl1"]=" Widget added signal not call"; - ctl["lbl2"]=" Widget creation aborted signal not call"; -// ctl["lbl3"]=" Widget content updated signal not call"; -// ctl["lbl4"]=" Widget faulted signal not call"; - - size["lbl1"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height); - size["lbl2"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height); -// size["lbl3"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height); -// size["lbl4"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height); - - AddLabelToTable(mTableView, ctl, size); - //CreateLabelList(ctl,size);//create textlabel list - - lblWidgetAdded=TextLabel::DownCast(mTableView.GetChildAt(0)); - lblWidgetCreationAbortedSignal=TextLabel::DownCast(mTableView.GetChildAt(1)); -// lblWidgetContentUpdatedSignal=TextLabel::DownCast(mTableView.GetChildAt(2)); -// lblWidgetFaultedSignal=TextLabel::DownCast(mTableView.GetChildAt(3)); - - mTableView.SetFixedHeight(0, 0.9*TEXTLABEL_HEIGHT * bodySize.height); - mTableView.SetFixedHeight(1, 0.9*TEXTLABEL_HEIGHT * bodySize.height); -// mTableView.SetFixedHeight(2, 0.9*TEXTLABEL_HEIGHT * bodySize.height); -// mTableView.SetFixedHeight(3, 0.9*TEXTLABEL_HEIGHT * bodySize.height); - - // - Vector2 buttonSize=Vector2(bodySize.width/5, BUTTON_HEIGHT*bodySize.height); - Vector2 position=Vector2(0.0f, 0.0f); - - btnLaunchWidget=CreateButton(AnchorPoint::TOP_LEFT, position, "launch", selectedRedColor, unSelectedRedColor, buttonSize); - btnLaunchWidget.ClickedSignal().Connect( this, &TBTDaliWidgetView::OnButtonClicked ); - mTableView.AddChild(btnLaunchWidget,TableView::CellPosition(15,0)); - - btnActivate=CreateButton(AnchorPoint::TOP_LEFT, position, "Activate", selectedColor, unSelectedColor, buttonSize); - btnActivate.ClickedSignal().Connect( this, &TBTDaliWidgetView::OnButtonClicked ); - mTableView.AddChild(btnActivate,TableView::CellPosition(15,1)); - - btnPause=CreateButton(AnchorPoint::TOP_LEFT, position, "Pause", unSelectedColor, selectedColor , buttonSize); - btnPause.ClickedSignal().Connect( this, &TBTDaliWidgetView::OnButtonClicked ); - mTableView.AddChild(btnPause,TableView::CellPosition(15,2)); - - btnResume=CreateButton(AnchorPoint::TOP_LEFT, position, "Resume", selectedColor, unSelectedColor, buttonSize); - btnResume.ClickedSignal().Connect( this, &TBTDaliWidgetView::OnButtonClicked ); - mTableView.AddChild(btnResume,TableView::CellPosition(15,3)); - - btnCancel=CreateButton(AnchorPoint::TOP_LEFT, position, "Cancel", unSelectedColor, selectedColor, buttonSize); - btnCancel.ClickedSignal().Connect( this, &TBTDaliWidgetView::OnButtonClicked ); - mTableView.AddChild(btnCancel,TableView::CellPosition(15,4)); -} -void TBTDaliWidgetView::onWidgetCreationAbortedSignal(WidgetView::WidgetView widgetView) -{ - DBG("TBTDaliWidgetView::onWidgetCreationAbortedSignal"); - this->lblWidgetCreationAbortedSignal.SetProperty( TextLabel::Property::TEXT, " Widget Creation Aborted Signal called" ); - this->lblWidgetCreationAbortedSignal.SetProperty( TextLabel::Property::TEXT_COLOR, Color::GREEN); -} -void TBTDaliWidgetView::onWidgetContentUpdatedSignal(WidgetView::WidgetView widgetView) -{ - DBG("TBTDaliWidgetView::onWidgetContentUpdatedSignal"); -// this->lblWidgetContentUpdatedSignal.SetProperty( TextLabel::Property::TEXT, " Widget Content Updated Signal called" ); -// this->lblWidgetContentUpdatedSignal.SetProperty( TextLabel::Property::TEXT_COLOR, Color::GREEN); -} -void TBTDaliWidgetView::onWidgetFaultedSignal(WidgetView::WidgetView widgetView) -{ - DBG("TBTDaliWidgetView::onWidgetFaultedSignal"); -// this->lblWidgetFaultedSignal.SetProperty( TextLabel::Property::TEXT, " Widget Faulted Signal called" ); -// this->lblWidgetFaultedSignal.SetProperty( TextLabel::Property::TEXT_COLOR, Color::GREEN); -} -bool TBTDaliWidgetView::OnButtonClicked( Button button ) -{ - DBG("TBTDaliWidgetView::OnButtonClicked"); - - if( button == btnPause ) - { - if( mWidgetLaunched == false ) - { - DBG("widget is not lauched. Please Click on launch button first"); - return false; - } - - if(! mWidgetView.PauseWidget()) - DBG("Widget pause failed"); - else - DBG("Widget paused"); - } - else if( button == btnResume ) - { - if( mWidgetLaunched == false ) - { - DBG("widget is not lauched. Please Click on launch button first"); - return false; - } - - if(! mWidgetView.ResumeWidget()) - DBG("Widget resume failed"); - else { - DBG("Widget resume"); - } - } - else if( button == btnCancel ) - { - if( mWidgetLaunched == false ) - { - DBG("widget is not lauched. Please Click on launch button first"); - return false; - } - - if(! mWidgetView.CancelTouchEvent()) - DBG("Cancel touch event failed."); - else - DBG("Cancel touch event"); - } - else if(btnActivate==button) - { - if( mWidgetLaunched == false ) - { - DBG("widget is not lauched. Please Click on launch button first"); - return false; - } - - DBG("btnActivate click"); - mWidgetView_1.WidgetCreationAbortedSignal().Connect( this, &TBTDaliWidgetView::onWidgetCreationAbortedSignal ); - mWidgetView_1.ActivateFaultedWidget(); - } - else if(btnLaunchWidget==button) - { - DBG("btnLaunch click"); - mWidgetViewManager = WidgetView::WidgetViewManager::New( mApplication, "org.tizen.tbtcoreapp-dali" ); - if( !mWidgetViewManager ) - { - DBG("Widget is not enabled!"); - return false; - } - - //Add widget - //mWidgetView = mWidgetViewManager.AddWidget("org.tizen.calendar.widget", "", bodySize.width, 0.9*bodySize.width, 2000.0 ); - mWidgetView = mWidgetViewManager.AddWidget("org.tizen.coretbtwidgetapp", "", bodySize.width, 0.9*bodySize.width/2, 2000.0 ); - mWidgetView.SetParentOrigin( ParentOrigin::TOP_LEFT ); - mWidgetView.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - mWidgetView.SetBackgroundColor( Vector4(0.0f, 0.0f, 0.0f, 0.0f) ); - mWidgetView.SetPosition( 0.0f, 0.0f ); - - mWidgetView.WidgetAddedSignal().Connect( this, &TBTDaliWidgetView::OnWidgetAdded ); - mWidgetView.WidgetDeletedSignal().Connect( this, &TBTDaliWidgetView::OnWidgetDeleted ); - //mWidgetView.WidgetCreationAbortedSignal().Connect( this, &TBTDaliWidgetView::onWidgetCreationAbortedSignal ); - mWidgetView.WidgetContentUpdatedSignal().Connect( this, &TBTDaliWidgetView::onWidgetContentUpdatedSignal ); - mWidgetView.WidgetFaultedSignal().Connect( this, &TBTDaliWidgetView::onWidgetFaultedSignal ); - //this->ctlBody.Add(mWidgetView); - mTableView.AddChild(mWidgetView, TableView::CellPosition(4,0)); - mTableView.SetFixedHeight(4, 0.9*bodySize.width/2); - - mWidgetView_1 = mWidgetViewManager.AddWidget("org.example.widget", "", bodySize.width, 0.9*bodySize.width/2, 2000.0 ); - mWidgetView_1.SetParentOrigin( ParentOrigin::TOP_LEFT ); - mWidgetView_1.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - mWidgetView_1.SetBackgroundColor( Vector4(0.0f, 0.0f, 0.0f, 0.0f) ); - mWidgetView_1.SetPosition( 0.0f, 0.0f ); - //mWidgetView_1.WidgetCreationAbortedSignal().Connect( this, &TBTDaliWidgetView::onWidgetCreationAbortedSignal ); - - mTableView.AddChild(mWidgetView_1, TableView::CellPosition(5,0)); - mTableView.SetFixedHeight(5, 0.9*bodySize.width/2); - mWidgetLaunched = true; - } - - return true; -} - -void TBTDaliWidgetView::OnWidgetAdded( WidgetView::WidgetView widgetView ) -{ - DBG("TBTDaliWidgetView::OnWidgetAdded"); - this->lblWidgetAdded.SetProperty( TextLabel::Property::TEXT, " Widget Added Signal called" ); - this->lblWidgetAdded.SetProperty( TextLabel::Property::TEXT_COLOR, Color::GREEN); -} - -void TBTDaliWidgetView::OnWidgetDeleted( WidgetView::WidgetView widgetView ) -{ - DBG("TBTDaliWidgetView::OnWidgetDeleted"); - //this->ctlBody.Remove( widgetView ); - mTableView.RemoveChildAt(TableView::CellPosition(3,2)); -} - diff --git a/tbtcoreapp-widget-new-dali/.cproject b/tbtcoreapp-widget-new-dali/.cproject deleted file mode 100644 index ff3dd50..0000000 --- a/tbtcoreapp-widget-new-dali/.cproject +++ /dev/null @@ -1,617 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tbtcoreapp-widget-new-dali/.exportMap b/tbtcoreapp-widget-new-dali/.exportMap deleted file mode 100644 index 43e310e..0000000 --- a/tbtcoreapp-widget-new-dali/.exportMap +++ /dev/null @@ -1,4 +0,0 @@ -{ - global: main; - local: *; -}; diff --git a/tbtcoreapp-widget-new-dali/.gitignore b/tbtcoreapp-widget-new-dali/.gitignore deleted file mode 100644 index 65fa71e..0000000 --- a/tbtcoreapp-widget-new-dali/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/Debug -/SA_Report diff --git a/tbtcoreapp-widget-new-dali/.package-stamp b/tbtcoreapp-widget-new-dali/.package-stamp deleted file mode 100644 index 40cbe59..0000000 --- a/tbtcoreapp-widget-new-dali/.package-stamp +++ /dev/null @@ -1 +0,0 @@ -TPK \ No newline at end of file diff --git a/tbtcoreapp-widget-new-dali/.project b/tbtcoreapp-widget-new-dali/.project deleted file mode 100644 index 679ac4a..0000000 --- a/tbtcoreapp-widget-new-dali/.project +++ /dev/null @@ -1,26 +0,0 @@ - - - tbtcoreapp-widget-new-dali - - - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - diff --git a/tbtcoreapp-widget-new-dali/.rds_delta b/tbtcoreapp-widget-new-dali/.rds_delta deleted file mode 100644 index 63a4f78..0000000 --- a/tbtcoreapp-widget-new-dali/.rds_delta +++ /dev/null @@ -1,29 +0,0 @@ -#delete -#add -#modify -author-signature.xml -signature1.xml -bin/tbtcoreapp-widget-new-dali -res/dali-toolkit-test-theme_720x1280.json -res/images/Default_home.png -res/images/customTextFieldBgImage.jpg -res/images/gallery-medium-1.jpg -res/images/gallery-medium-10.jpg -res/images/gallery-medium-11.jpg -res/images/gallery-medium-12.jpg -res/images/gallery-medium-13.jpg -res/images/gallery-medium-14.jpg -res/images/gallery-medium-2.jpg -res/images/gallery-medium-3.jpg -res/images/gallery-medium-4.jpg -res/images/gallery-medium-5.jpg -res/images/gallery-medium-6.jpg -res/images/gallery-medium-7.jpg -res/images/gallery-medium-8.jpg -res/images/gallery-medium-9.jpg -res/images/innerButtonSelected.png -res/images/innerButtonUnselected.png -res/images/text-field-bg.9.png -res/images/top-bar.png -shared/res/tbtcoreapp-dali.png -tizen-manifest.xml diff --git a/tbtcoreapp-widget-new-dali/.sdk_delta.info b/tbtcoreapp-widget-new-dali/.sdk_delta.info deleted file mode 100644 index 23e34c5..0000000 Binary files a/tbtcoreapp-widget-new-dali/.sdk_delta.info and /dev/null differ diff --git a/tbtcoreapp-widget-new-dali/.tproject b/tbtcoreapp-widget-new-dali/.tproject deleted file mode 100644 index 658e81b..0000000 --- a/tbtcoreapp-widget-new-dali/.tproject +++ /dev/null @@ -1,12 +0,0 @@ - - - - - mobile-5.0 - - - - - - - diff --git a/tbtcoreapp-widget-new-dali/inc/utils/logger.h b/tbtcoreapp-widget-new-dali/inc/utils/logger.h deleted file mode 100644 index 055e83e..0000000 --- a/tbtcoreapp-widget-new-dali/inc/utils/logger.h +++ /dev/null @@ -1,57 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - *******************************************************************************/ - -/** - * @file logger.h - * @brief This file provide necessary macro for logging information. - * @since_tizen 2.3 - * @author Awadhesh Singh (awadhesh1.s@samsung.com) - * @date July, 2018 - * @bug - * @credit - */ -#ifndef __LOGGER_H__ -#define __LOGGER_H__ - -#include - -#define LOG_TAG_CORE "[TBT_DALI_CORE]_" - -#define DLOG(prio, fmt, arg...) dlog_print(prio, LOG_TAG_CORE, "%s (Line: %d) > " fmt, __func__, __LINE__, ##arg) -#define DBG(fmt, arg...) DLOG(DLOG_DEBUG, fmt, ##arg) -#define ERR(fmt, arg...) DLOG(DLOG_ERROR, fmt, ##arg) - -#define RETM_IF(expr, fmt, arg...) \ -{ \ - if (expr) \ - { \ - ERR(fmt, ##arg); \ - return; \ - } \ -} - -#define RETVM_IF(expr, val, fmt, arg...) \ -{ \ - if (expr) \ - { \ - ERR(fmt, ##arg); \ - return (val); \ - } \ -} - -#define SAFE_DELETE(a) if( (a) != NULL ) free (a); (a) = NULL; - -#endif /* __LOGGER_H__ */ diff --git a/tbtcoreapp-widget-new-dali/inc/view/tbt-dali-widget-custom-view.h b/tbtcoreapp-widget-new-dali/inc/view/tbt-dali-widget-custom-view.h deleted file mode 100644 index 0bb27c9..0000000 --- a/tbtcoreapp-widget-new-dali/inc/view/tbt-dali-widget-custom-view.h +++ /dev/null @@ -1,48 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - *******************************************************************************/ -/** - * @file tbt-dali-widget-custom-view.h - * @brief To test functionality of dali widget - * - * @author Awadhesh Singh (awadhesh1.s@samsung.com) - * @date July, 2018 - * @credit - * - */ -#ifndef __TBT_MODULE_APP_DALI_CUSTOM_WIDGET -#define __TBT_MODULE_APP_DALI_CUSTOM_WIDGET -#include -#include -#include "utils/logger.h" - -using namespace Dali; -using namespace Dali::Toolkit; - -class WidgetViewApplicationController : public ConnectionTracker -{ -public: - WidgetViewApplicationController(Application& application); - void Create(Application& application); - bool OnWidgetAdded(Toolkit::Button button ); - bool OnWidgetDeleted(Toolkit::Button button ); - -private: - void OnKeyEvent(const KeyEvent& event); - Application & mApplication; - WidgetView::WidgetViewManager mWidgetViewManager; - WidgetView::WidgetView mWidgetView; -}; -#endif diff --git a/tbtcoreapp-widget-new-dali/shared/res/tbtcoreapp-dali.png b/tbtcoreapp-widget-new-dali/shared/res/tbtcoreapp-dali.png deleted file mode 100644 index 9765b1b..0000000 Binary files a/tbtcoreapp-widget-new-dali/shared/res/tbtcoreapp-dali.png and /dev/null differ diff --git a/tbtcoreapp-widget-new-dali/src/tbtcoreapp-dali-new.cpp b/tbtcoreapp-widget-new-dali/src/tbtcoreapp-dali-new.cpp deleted file mode 100644 index 1b8a00b..0000000 --- a/tbtcoreapp-widget-new-dali/src/tbtcoreapp-dali-new.cpp +++ /dev/null @@ -1,38 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - *******************************************************************************/ -/** - * @file tbtcoreapp-dali-new.cpp - * @brief tbt dali entry file - * - * @author Awadhesh singh (awadhesh1.s@samsung.com) - * @date July, 2018 - * @credit - * - */ - -#include -#include "utils/logger.h" -#include "view/tbt-dali-widget-custom-view.h" - -using namespace Dali; -using namespace Dali::Toolkit; -int main( int argc, char **argv ) -{ - Application application = Application::New( &argc, &argv, ""); - WidgetViewApplicationController test( application ); - application.MainLoop(Configuration::APPLICATION_HANDLES_CONTEXT_LOSS); - return 0; -} diff --git a/tbtcoreapp-widget-new-dali/src/view/tbt-dali-widget-custom-view.cpp b/tbtcoreapp-widget-new-dali/src/view/tbt-dali-widget-custom-view.cpp deleted file mode 100644 index cc0f50f..0000000 --- a/tbtcoreapp-widget-new-dali/src/view/tbt-dali-widget-custom-view.cpp +++ /dev/null @@ -1,97 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - *******************************************************************************/ -/** - * @file tbt-dali-widget-custom-view.cpp - * @brief To test functionality of dali widget - * - * @author Awadhesh Singh (awadhesh1.s@samsung.com) - * @date July, 2018 - * @credit - * - */ -#include "view/tbt-dali-widget-custom-view.h" - -WidgetViewApplicationController::WidgetViewApplicationController(Application& application):mApplication(application) -{ - DBG(">>>>>>WidgetViewApplicationController "); - mApplication.InitSignal().Connect(this,&WidgetViewApplicationController::Create); -} - -void WidgetViewApplicationController::Create(Application& application) -{ - DBG(">>>>Create called "); - - Stage stage = Stage::GetCurrent(); - stage.SetBackgroundColor( Color::BLACK ); - stage.KeyEventSignal().Connect( this, &WidgetViewApplicationController::OnKeyEvent ); - - mWidgetViewManager = WidgetView::WidgetViewManager::New( mApplication, "org.tizen.tbtcoreapp-widget-new-dali" ); - - PushButton button = PushButton::New(); - button.ClickedSignal().Connect( this, &WidgetViewApplicationController::OnWidgetDeleted ); - button.SetParentOrigin( ParentOrigin::BOTTOM_LEFT ); - button.SetAnchorPoint( ParentOrigin::BOTTOM_LEFT ); - button.SetProperty(Button::Property::LABEL, "Delete Widget"); - button.SetPosition( 0, 0 ); - button.SetSize(300,100); - stage.Add( button ); - - PushButton button2 = PushButton::New(); - button2.ClickedSignal().Connect( this, &WidgetViewApplicationController::OnWidgetAdded ); - button2.SetParentOrigin( ParentOrigin::BOTTOM_RIGHT ); - button2.SetAnchorPoint( ParentOrigin::BOTTOM_RIGHT ); - button2.SetProperty(Button::Property::LABEL, "Add Widget"); - button2.SetPosition( 0, 0 ); - button2.SetSize(300,100); - stage.Add( button2 ); -} - -bool WidgetViewApplicationController::OnWidgetAdded(Toolkit::Button button ) -{ - DBG("WidgetViewApplicationController::OnWidgetAdded"); - if(!mWidgetView) - { - mWidgetView = mWidgetViewManager.AddWidget("org.tizen.coretbtwidgetapp-dali","",480,680,-1); - mWidgetView.SetParentOrigin( ParentOrigin::CENTER ); - mWidgetView.SetAnchorPoint( AnchorPoint::CENTER ); - mWidgetView.SetBackgroundColor( Vector4(0.0f, 0.0f, 0.0f, 0.0f) ); - Stage::GetCurrent().Add( mWidgetView ); - } - return true; -} - -bool WidgetViewApplicationController::OnWidgetDeleted(Toolkit::Button button ) -{ - DBG("WidgetViewApplicationController::OnWidgetDeleted"); - if(mWidgetView) - { - mWidgetView.TerminateWidget(); - Stage::GetCurrent().Remove( mWidgetView ); - mWidgetView.Reset(); - } - return true; -} - -void WidgetViewApplicationController::OnKeyEvent(const KeyEvent& event) -{ - if(event.state == KeyEvent::Down) - { - if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) ) - { - mApplication.Quit(); - } - } -} diff --git a/tbtcoreapp-widget-new-dali/tizen-manifest.xml b/tbtcoreapp-widget-new-dali/tizen-manifest.xml deleted file mode 100644 index bd4149d..0000000 --- a/tbtcoreapp-widget-new-dali/tizen-manifest.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - tbtcoreapp-dali.png - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://tizen.org/privilege/mediastorage - http://tizen.org/privilege/appmanager.launch - http://tizen.org/privilege/externalstorage - http://tizen.org/privilege/widget.viewer - - true - diff --git a/tbtcoreapp/inc/model/tbt-info.h b/tbtcoreapp/inc/model/tbt-info.h index 17fb754..6af126b 100755 --- a/tbtcoreapp/inc/model/tbt-info.h +++ b/tbtcoreapp/inc/model/tbt-info.h @@ -299,8 +299,6 @@ typedef enum { TBT_APP_DALI_SCROLL, - TBT_APP_DALI_WIDGET, - TBT_APP_DALI_CUSTOM_WIDGET, TBT_APP_MULTICLASS, TBT_APP_USBHOST, diff --git a/tbtcoreapp/inc/view/tbt-dali-custom-view.h b/tbtcoreapp/inc/view/tbt-dali-custom-view.h deleted file mode 100755 index a6a5dad..0000000 --- a/tbtcoreapp/inc/view/tbt-dali-custom-view.h +++ /dev/null @@ -1,54 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - *******************************************************************************/ -/** - * @file tbt-dali-custom-view.h - * @brief This view provide the Apps tested the dali widget functionality. - * @since_tizen 5.0 - * @author Awadhesh Singh (awadhesh1.s@samsung.com) - * @date July, 2018 - * @bug No known bug. - * @credit Tizen Application framework Example - * - */ - -#ifndef __TBT_DALI_CUSTOM_VIEW_H__ -#define __TBT_DALI_CUSTOM_VIEW_H__ - -#include "utils/app_module_config.h" -#ifdef TBT_MODULE_DALI - -#include -#include "model/tbt-list.h" - -/** - * @typedef _dali_custom_view - * @since_tizen 5.0 - * @brief A dali custom viewer view handle. - */ -typedef struct _dali_custom_view dali_custom_view; - -/** - * @brief Create dali_custom_view_add - * @since_tizen 5.0 - * @param[in] navi Parent naviframe - * @param[in] tbt_info Custom struct contains all the necessary information of the moduales - * @param[in] item Is the selected item of the Application home genlist - * @return Pointer of dali_custom_view on success, otherwise NULL - */ -dali_custom_view *dali_custom_view_add(Evas_Object *navi, tbt_info *tbt_info, Elm_Object_Item *item); - -#endif -#endif // __TBT_DALI_CUSTOM_VIEW_H__ diff --git a/tbtcoreapp/project_def.prop b/tbtcoreapp/project_def.prop index 34a5708..b627e44 100644 --- a/tbtcoreapp/project_def.prop +++ b/tbtcoreapp/project_def.prop @@ -9,7 +9,7 @@ type = app profile = mobile-5.0 # C/CPP Sources -USER_SRCS = src/view/tbt-mock-view.c src/utils/gl-types.c src/view/tbt-mtp-view.c src/view/tbt-sound-view.c src/view/tbt-bluetoothle-view.c src/view/tbt-wifidirect-info-view.c src/view/tbt-dali-view.c src/view/tbt-sound-manager-view.c src/view/tbt-touch-view.c src/view/tbt-cbhm-view.c src/view/tbt-systemsettings-view.c src/view/tbt-voice-control-view.c src/view/tbt-gps-view.c src/view/tbt-stt-view.c src/view/tbt-event-view.c src/utils/gl-utils.c src/view/tbt-radio-view.c src/view/tbt-datacontrol-view.c src/view/tbt-display-view.c src/main.c src/view/tbt-nsd-dns-sd-view.c src/view/tbt-wifi-view.c src/window.c src/view/tbt-connection-view.c src/view/tbt-shortcut-view.c src/view/tbt-input-view.c src/view/tbt-usb-host-view.c src/view/tbt-camera-view.c src/view/tbt-bluetoothoob-view.c src/utils/xml-util.c src/view/tbt-oauth2-view.c src/view/tbt-package-manager-view.c src/view/tbt-multiclass-view.c src/model/tbt-list.c src/view/tbt-oauth2-info-view.c src/view/tbt-graphics-view.c src/view/tbt-wifidirect-view.c src/view/tbt-efl-callbacks.c src/view/tbt-animation-view.c src/view/tbt-screenmirrorsink-view.c src/view/tbt-ui-view.c src/view/tbt-nfc-view.c src/view/tbt-attachpanel-view.c src/view/tbt-widget-view.c src/view/tbt-image-view.c src/view/tbt-bluetooth-callback-view.c src/view/tbt-autofill-view.c src/view/tbt-nsd-ssdp-view.c src/view/tbt-dali-custom-view.c src/view/tbt-motion-detection-view.c src/view/tbt-ime-view.c src/view/tbt-iotcon-view.c src/view/tbt-contacts-view.c src/utils/util_state_object.c src/view/tbt-runtimeinfo-view.c src/utils/ui-utils.c src/view/tbt-tts-view.c src/view/tbt-bluetooth-view.c src/view/tbt-feature-view.c src/view/tbt-sensor-view.c src/view/tbt-list-view.c src/view/tbt-local-view.c src/view/tbt-storage-view.c src/view/tbt-push-view.c src/view/tbt-nfc-hce-preferred-view.c src/view/tbt-common-view.c src/view/tbt-notification-view.c src/main-app.c src/view/tbt-genlist-view.c src/view/tbt-pick-view.c src/view/tbt-media-key-view.c +USER_SRCS = src/view/tbt-mock-view.c src/utils/gl-types.c src/view/tbt-mtp-view.c src/view/tbt-sound-view.c src/view/tbt-bluetoothle-view.c src/view/tbt-wifidirect-info-view.c src/view/tbt-dali-view.c src/view/tbt-sound-manager-view.c src/view/tbt-touch-view.c src/view/tbt-cbhm-view.c src/view/tbt-systemsettings-view.c src/view/tbt-voice-control-view.c src/view/tbt-gps-view.c src/view/tbt-stt-view.c src/view/tbt-event-view.c src/utils/gl-utils.c src/view/tbt-radio-view.c src/view/tbt-datacontrol-view.c src/view/tbt-display-view.c src/main.c src/view/tbt-nsd-dns-sd-view.c src/view/tbt-wifi-view.c src/window.c src/view/tbt-connection-view.c src/view/tbt-shortcut-view.c src/view/tbt-input-view.c src/view/tbt-usb-host-view.c src/view/tbt-camera-view.c src/view/tbt-bluetoothoob-view.c src/utils/xml-util.c src/view/tbt-oauth2-view.c src/view/tbt-package-manager-view.c src/view/tbt-multiclass-view.c src/model/tbt-list.c src/view/tbt-oauth2-info-view.c src/view/tbt-graphics-view.c src/view/tbt-wifidirect-view.c src/view/tbt-efl-callbacks.c src/view/tbt-animation-view.c src/view/tbt-screenmirrorsink-view.c src/view/tbt-ui-view.c src/view/tbt-nfc-view.c src/view/tbt-attachpanel-view.c src/view/tbt-widget-view.c src/view/tbt-image-view.c src/view/tbt-bluetooth-callback-view.c src/view/tbt-autofill-view.c src/view/tbt-nsd-ssdp-view.c src/view/tbt-motion-detection-view.c src/view/tbt-ime-view.c src/view/tbt-iotcon-view.c src/view/tbt-contacts-view.c src/utils/util_state_object.c src/view/tbt-runtimeinfo-view.c src/utils/ui-utils.c src/view/tbt-tts-view.c src/view/tbt-bluetooth-view.c src/view/tbt-feature-view.c src/view/tbt-sensor-view.c src/view/tbt-list-view.c src/view/tbt-local-view.c src/view/tbt-storage-view.c src/view/tbt-push-view.c src/view/tbt-nfc-hce-preferred-view.c src/view/tbt-common-view.c src/view/tbt-notification-view.c src/main-app.c src/view/tbt-genlist-view.c src/view/tbt-pick-view.c src/view/tbt-media-key-view.c # EDC Sources USER_EDCS = diff --git a/tbtcoreapp/src/model/tbt-list.c b/tbtcoreapp/src/model/tbt-list.c index 0d4e91b..f092e72 100755 --- a/tbtcoreapp/src/model/tbt-list.c +++ b/tbtcoreapp/src/model/tbt-list.c @@ -2770,34 +2770,6 @@ static tbt_info tbtapps[] = .required_features_count = 0 }, #endif - #ifdef TBT_MODULE_APP_DALI_WIDGET - - //DALi Test - { - .name = "DALi Widget", - .parent = "DALi", - .apptype = TBT_APP_DALI_WIDGET, - .icon_name = "dummy", - .info = "DALi Widget Functionality", - .result = 0, - .required_features_count = 0 - }, - - #endif - #ifdef TBT_MODULE_APP_DALI_CUSTOM_WIDGET - - //DALi Test - { - .name = "DALi Custom Widget", - .parent = "DALi", - .apptype = TBT_APP_DALI_CUSTOM_WIDGET, - .icon_name = "dummy", - .info = "1. Please install org.tizen.tbtcoreapp-widget-new-dali tpk file
2. Click View Widget UI button
3. Dali Widget app gets launched.
4. click on add button, hello world widget should launch
5. click on remove button, widget should be removed
6. If hello world widget is added/remove then press Pass. " - "Otherwise, press Fail", - .result = 0, - .required_features_count = 0 - }, - #endif #endif #ifdef TBT_MODULE_MULTICLASS diff --git a/tbtcoreapp/src/view/tbt-dali-custom-view.c b/tbtcoreapp/src/view/tbt-dali-custom-view.c deleted file mode 100644 index 404d76f..0000000 --- a/tbtcoreapp/src/view/tbt-dali-custom-view.c +++ /dev/null @@ -1,201 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - *******************************************************************************/ -/** - * @file tbt-dali-custom-view.cpp - * @brief This view provide the Apps tested the dali widget functionality. - * @author Awadhesh Singh (awadhesh1.s@samsung.com) - * @date July, 2018 - * @bug No known bug. - * @credit Tizen Application framework Example - * - */ - -#include "utils/app_module_config.h" -#ifdef TBT_MODULE_DALI - -#include "utils/logger.h" -#include "utils/config.h" -#include "utils/ui-utils.h" -#include "view/tbt-dali-custom-view.h" -#include "view/tbt-common-view.h" - -struct _dali_custom_view -{ - common_view* view; - Evas_Object *label; - Evas_Object* btn_dali_widget_app; - app_control_h service; -}; - - -static Evas_Object *add_control_layout(dali_custom_view *this, Evas_Object *parent); -static void _app_destroy_cb(void* this); -static void dali_widget_app_launch_button_pressed_cb(void *data, Evas_Object *obj, void *event_info); -static void app_control_view_reply_cb(app_control_h request, app_control_h reply, app_control_result_e result, void *data); - -static char* get_app_control_error(int ret) -{ - char* error = NULL; - - switch (ret) { - case APP_CONTROL_ERROR_NONE: - error = "APP_CONTROL_ERROR_NONE"; - break; - case APP_CONTROL_ERROR_INVALID_PARAMETER: - error = "APP_CONTROL_ERROR_INVALID_PARAMETER"; - break; - case APP_CONTROL_ERROR_OUT_OF_MEMORY: - error = "APP_CONTROL_ERROR_OUT_OF_MEMORY"; - break; - case APP_CONTROL_ERROR_APP_NOT_FOUND: - error = "APP_CONTROL_ERROR_APP_NOT_FOUND"; - break; - case APP_CONTROL_ERROR_KEY_NOT_FOUND: - error = "APP_CONTROL_ERROR_KEY_NOT_FOUND"; - break; - case APP_CONTROL_ERROR_KEY_REJECTED: - error = "APP_CONTROL_ERROR_KEY_REJECTED"; - break; - case APP_CONTROL_ERROR_INVALID_DATA_TYPE: - error = "APP_CONTROL_ERROR_INVALID_DATA_TYPE"; - break; - case APP_CONTROL_ERROR_LAUNCH_REJECTED: - error = "APP_CONTROL_ERROR_LAUNCH_REJECTED"; - break; - case APP_CONTROL_ERROR_PERMISSION_DENIED: - error = "APP_CONTROL_ERROR_PERMISSION_DENIED"; - break; - case APP_CONTROL_ERROR_LAUNCH_FAILED: - error = "APP_CONTROL_ERROR_LAUNCH_FAILED"; - break; - case APP_CONTROL_ERROR_TIMED_OUT: - error = "APP_CONTROL_ERROR_TIMED_OUT"; - break; -#ifdef TIZEN_3_0 - case APP_CONTROL_ERROR_IO_ERROR: - error = "APP_CONTROL_ERROR_IO_ERROR"; - break; -#endif -#ifdef TIZEN_2_4 - case APP_CONTROL_ERROR_IO_ERROR: - error = "APP_CONTROL_ERROR_IO_ERROR"; - break; -#endif - default: - error = "Unknown Error"; - break; - } - return error; -} - -dali_custom_view *dali_custom_view_add(Evas_Object *navi, tbt_info *tbt_info, Elm_Object_Item *item) -{ - RETVM_IF(NULL == navi, NULL, "navi is null"); - - dali_custom_view *this = NULL; - this = calloc(1, sizeof(dali_custom_view)); - RETVM_IF(!this, NULL, "calloc failed"); - - this->view = calloc(1, sizeof(common_view)); - RETVM_IF(!this->view, NULL, "calloc failed"); - - - tbt_info->layout_group = "multiclass_viewer"; - tbt_info->layout_file = get_edje_path("multiclass_viewer.edj"); - - common_view_add(navi, tbt_info, item, this->view, _app_destroy_cb, this); - RETVM_IF(NULL == this->view, NULL, "navi is null"); - - this->label = ui_utils_label_add(this->view->layout, ""); - RETVM_IF(!this->label, NULL, "ui_utils_label_add failed"); - ui_utils_label_set_text(this->label, "press button to launch app", "left"); - elm_object_part_content_set(this->view->layout, "multiclass_text", this->label); - - Evas_Object *control = add_control_layout(this, this->view->layout); - elm_object_part_content_set(this->view->layout, "controlr_part", control); - - return this; -} - -static Evas_Object *add_control_layout(dali_custom_view *this, Evas_Object *parent) -{ - RETVM_IF(NULL == this, NULL, "view is NULL"); - this->btn_dali_widget_app = ui_utils_push_button_add(this, parent, "View Widget UI", dali_widget_app_launch_button_pressed_cb); - - return this->btn_dali_widget_app ; -} - -static void dali_widget_app_launch_button_pressed_cb(void *data, Evas_Object *obj, void *event_info) -{ - RETM_IF(NULL == data, "data is NULL"); - char *key = "widget_id"; - dali_custom_view *view = NULL; - view = (dali_custom_view*)data; - RETM_IF(NULL == view, "view is NULL"); - - DBG("dali_widget_app_launch_button_pressed_cb"); - - char *appid = VIEWER_VIEW_APP_PACKAGE_NAME; - int nStatus = app_control_create(&view->service); - RETM_IF(nStatus != APP_CONTROL_ERROR_NONE, "app_control_create error : %s", get_app_control_error(nStatus)); - DBG("app_control_create nStatus=%d",nStatus); - - nStatus = app_control_set_app_id(view->service, "org.tizen.tbtcoreapp-widget-new-dali"); - RETM_IF(nStatus != APP_CONTROL_ERROR_NONE, "app_control_set_app_id error : %s", get_app_control_error(nStatus)); - DBG("app_control_set_app_id nStatus=%d",nStatus); - - nStatus = app_control_send_launch_request(view-> service, app_control_view_reply_cb, view); - RETM_IF(APP_CONTROL_ERROR_NONE != nStatus, "app_control_send_launch_request failed :%s", get_app_control_error(nStatus)); - ui_utils_label_set_text(view->label, "App launch requested.", "left"); -} - -static void app_control_view_reply_cb(app_control_h request, app_control_h reply, app_control_result_e result, void *data) -{ - RETM_IF(NULL == data, "data is NULL"); - - dali_custom_view *view = NULL; - view = (dali_custom_view*)data; - RETM_IF(NULL == view, "view is NULL"); - - if(result == APP_CONTROL_RESULT_SUCCEEDED) - { - int result; - char *app_id; - - if(reply != NULL) - { - result = app_control_get_app_id(reply, &app_id); - RETM_IF(APP_CONTROL_ERROR_NONE != result, "app_control_create failed :%s", get_app_control_error(result)); - DBG("app_id is %s", app_id); - - ui_utils_label_set_text(view->label, "App launched successfully.", "left"); - } - } -} - -static void _app_destroy_cb(void* this) -{ - RETM_IF(NULL == this, "data is NULL"); - - dali_custom_view *view = NULL; - view = (dali_custom_view*)this; - RETM_IF(NULL == view, "view is NULL"); - app_control_destroy(view->service); - SAFE_DELETE(view->view); - SAFE_DELETE(view); -} - -#endif diff --git a/tbtcoreapp/src/view/tbt-dali-view.c b/tbtcoreapp/src/view/tbt-dali-view.c index d32d8da..8ac1c08 100644 --- a/tbtcoreapp/src/view/tbt-dali-view.c +++ b/tbtcoreapp/src/view/tbt-dali-view.c @@ -177,20 +177,9 @@ dali_view *dali_view_add(Evas_Object *navi, tbt_info *tbt_info, Elm_Object_Item ret = app_control_set_mime(this->service, this->dali->mime); RETVM_IF(APP_CONTROL_ERROR_NONE != ret, NULL,"app_control_set_mime failed :%s", get_app_control_error(ret)); - if(strcmp(module_name, "TBT_APP_DALI_CUSTOM_WIDGET") == 0) - { - - ret = app_control_set_app_id(this->service, "org.tizen.tbtcoreapp-widget-new-dali"); - - } - else - { - ret = app_control_set_app_id(this->service, "org.tizen.tbtcoreapp-dali"); - - - ret = app_control_add_extra_data(this->service, "module_name", this->module_name); - RETVM_IF(APP_CONTROL_ERROR_NONE != ret, NULL,"app_control_set_mime failed :%s", get_app_control_error(ret)); - } + ret = app_control_set_app_id(this->service, "org.tizen.tbtcoreapp-dali"); + ret = app_control_add_extra_data(this->service, "module_name", this->module_name); + RETVM_IF(APP_CONTROL_ERROR_NONE != ret, NULL,"app_control_set_mime failed :%s", get_app_control_error(ret)); ret = app_control_send_launch_request(this->service , app_control_view_cb, this); RETVM_IF(APP_CONTROL_ERROR_NONE != ret, NULL, "app_control_send_launch_request failed :%s", get_app_control_error(ret)); diff --git a/tbtcoreapp/src/view/tbt-genlist-view.c b/tbtcoreapp/src/view/tbt-genlist-view.c index b7fd6fa..0aa0f13 100755 --- a/tbtcoreapp/src/view/tbt-genlist-view.c +++ b/tbtcoreapp/src/view/tbt-genlist-view.c @@ -102,7 +102,6 @@ #include "view/tbt-usb-host-view.h" #include "view/tbt-motion-detection-view.h" #include "view/tbt-cbhm-view.h" -#include "view/tbt-dali-custom-view.h" #include "view/tbt-autofill-view.h" typedef struct { @@ -1234,12 +1233,6 @@ static void _gl_item_selected_cb(void *data, Evas_Object *obj EINA_UNUSED, void case TBT_APP_DALI_APP: dali_view_add(view->navi, info, it, "TBT_APP_DALI_APP"); break; - case TBT_APP_DALI_WIDGET: - dali_view_add(view->navi, info, it, "TBT_APP_DALI_WIDGET"); - break; - case TBT_APP_DALI_CUSTOM_WIDGET: - dali_custom_view_add(view->navi, info, it); - break; #endif