[TBT][DALI][Non-ACR][TSAM-10140 TSAM-10080 Issues Fixed] 02/100102/1
authorJahangir <ja.alam@samsung.com>
Fri, 25 Nov 2016 17:23:26 +0000 (12:23 -0500)
committerJahangir <ja.alam@samsung.com>
Fri, 25 Nov 2016 17:29:29 +0000 (12:29 -0500)
Change-Id: I59226223367f75971666068b7ae431bcf0aa38e6

31 files changed:
release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk
release/binary-armv7l/org.tizen.tbtcoreapp-dali-1.0.0-arm.tpk
release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk
release/binary-x86/org.tizen.tbtcoreapp-dali-1.0.0-i386.tpk
tbtcoreapp-dali/inc/utils/dali-ui-utils.h
tbtcoreapp-dali/inc/view/tbt-dali-accessibility-manager-flick-view.h [new file with mode: 0644]
tbtcoreapp-dali/inc/view/tbt-dali-accessibility-manager-swipe-view.h [new file with mode: 0644]
tbtcoreapp-dali/inc/view/tbt-dali-accessibility-manager-tap-view.h [new file with mode: 0644]
tbtcoreapp-dali/inc/view/tbt-dali-accessibility-manager-view.h
tbtcoreapp-dali/inc/view/tbt-dali-keyboard-focus-manager-view.h
tbtcoreapp-dali/src/tbtcoreapp-dali.cpp
tbtcoreapp-dali/src/utils/dali-ui-utils.cpp
tbtcoreapp-dali/src/view/tbt-dali-accessibilty-manager-flick-view.cpp [new file with mode: 0644]
tbtcoreapp-dali/src/view/tbt-dali-accessibilty-manager-swipe-view.cpp [new file with mode: 0644]
tbtcoreapp-dali/src/view/tbt-dali-accessibilty-manager-tap-view.cpp [new file with mode: 0644]
tbtcoreapp-dali/src/view/tbt-dali-accessibilty-manager-view.cpp
tbtcoreapp-dali/src/view/tbt-dali-keyboard-focus-manager-view.cpp
tbtcoreapp-dali/src/view/tbt-dali-long-press-gesture-double-view.cpp
tbtcoreapp-dali/src/view/tbt-dali-long-press-gesture-multiple-view.cpp
tbtcoreapp-dali/src/view/tbt-dali-long-press-gesture-single-view.cpp
tbtcoreapp-dali/src/view/tbt-dali-pan-gesture-angle-direction-view.cpp
tbtcoreapp-dali/src/view/tbt-dali-pan-gesture-double-view.cpp
tbtcoreapp-dali/src/view/tbt-dali-pan-gesture-single-view.cpp
tbtcoreapp-dali/src/view/tbt-dali-pinch-gesture-single-view.cpp
tbtcoreapp-dali/src/view/tbt-dali-stage-view.cpp
tbtcoreapp-dali/src/view/tbt-dali-tap-gesture-muliple-view.cpp
tbtcoreapp-dali/src/view/tbt-dali-tap-gesture-single-view.cpp
tbtcoreapp/inc/model/tbt-info.h
tbtcoreapp/inc/utils/app_module_config.h
tbtcoreapp/src/model/tbt-list.c
tbtcoreapp/src/view/tbt-genlist-view.c

index 20a38965c504dc5fb52740097fd876253e8be5fc..9f34b6212dcb1ccd3a39fea15a7ee91fa0ef5403 100644 (file)
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
index 9cec5c85041b97ea97fde084b24d277bb7fba48c..46ce7691099fd71d49ad7199f79fc4f4813c80bf 100644 (file)
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
index 518c998e1dd82808874b5a3d529906877bbff31f..0c8d1d5dd620ccf2ddc21d70c0103c0578f845b2 100644 (file)
Binary files a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk differ
index 36f718e1102108895888866a7242814ef8f0802f..c4441d34af5141509d0b7de6d4907bc07f2af324 100644 (file)
Binary files a/release/binary-x86/org.tizen.tbtcoreapp-dali-1.0.0-i386.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-dali-1.0.0-i386.tpk differ
index 599cc2df65f260da32e1eca8a1e016b40c43cd9c..e81a65f42313ea70e7e31c9174b7664df3ea2689 100644 (file)
@@ -105,6 +105,7 @@ public:
                        std::string txt, Vector2 size/*, X* obj, Ret (X::*onClickedCallback)(Arg0 arg0)*/ );
 
        void CreateLabelList(Property::Map keyMap, Property::Map sizeMap);
+       void AddLabelToTable(TableView table,Property::Map keyMap, Property::Map sizeMap);
 
        void FillInfoPage(std::string content);
 
diff --git a/tbtcoreapp-dali/inc/view/tbt-dali-accessibility-manager-flick-view.h b/tbtcoreapp-dali/inc/view/tbt-dali-accessibility-manager-flick-view.h
new file mode 100644 (file)
index 0000000..cfc509f
--- /dev/null
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * 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-accessibility-manager-flick-view.h
+ * @brief      To test functionality of accessibility manager
+ *
+ * @author     Jahangir Alam(ja.alam@samsung.com)
+ * @date       November, 2016
+ * @credit
+ *
+ */
+
+#ifndef __TBT_MODULE_APP_DALI_ACCESSIBILITY_MANAGER_FLICK
+#define __TBT_MODULE_APP_DALI_ACCESSIBILITY_MANAGER_FLICK
+#include <dali.h>
+
+#include "utils/logger.h"
+#include "utils/config.h"
+#include "utils/ui-utils.h"
+#include "utils/dali-ui-utils.h"
+
+class TBTDaliAccessibilityManagerFlickView: public UiUtils {
+
+private:
+       AccessibilityManager mAccessibilityManager;
+
+       TextLabel lblActionNextSignal;
+       TextLabel lblActionPreviousSignal;
+       TextLabel lblActionReadNextSignal;
+       TextLabel lblActionReadPreviousSignal;
+
+       PushButton btnUp;
+       PushButton btnDown;
+
+       TableView mTableView;
+
+public:
+       TBTDaliAccessibilityManagerFlickView(Application& mApplication, app_control_h _control);
+
+       bool onActionNextSignal(AccessibilityManager& manager);
+       bool onActionPreviousSignal(AccessibilityManager& manager);
+       bool onActionReadNextSignal(AccessibilityManager& manager);
+       bool onActionReadPreviousSignal(AccessibilityManager& manager);
+       bool OnUpClick(Button button);
+       bool OnDownClick(Button button);
+
+};
+
+#endif // __TBT_MODULE_APP_DALI_ACCESSIBILITY_MANAGER_FLICK
+
diff --git a/tbtcoreapp-dali/inc/view/tbt-dali-accessibility-manager-swipe-view.h b/tbtcoreapp-dali/inc/view/tbt-dali-accessibility-manager-swipe-view.h
new file mode 100644 (file)
index 0000000..2341c84
--- /dev/null
@@ -0,0 +1,68 @@
+/*******************************************************************************
+ * 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-accessibility-manager-swipe-view.h
+ * @brief      To test functionality of accessibility manager
+ *
+ * @author     Jahangir Alam(ja.alam@samsung.com)
+ * @date       November, 2016
+ * @credit
+ *
+ */
+
+#ifndef __TBT_MODULE_APP_DALI_ACCESSIBILITY_MANAGER_SWIPE
+#define __TBT_MODULE_APP_DALI_ACCESSIBILITY_MANAGER_SWIPE
+#include <dali.h>
+
+#include "utils/logger.h"
+#include "utils/config.h"
+#include "utils/ui-utils.h"
+#include "utils/dali-ui-utils.h"
+
+class TBTDaliAccessibilityManagerSwipeView: public UiUtils {
+
+private:
+       AccessibilityManager mAccessibilityManager;
+
+       TextLabel lblActionScrollUpSignal;
+       TextLabel lblActionScrollDownSignal;
+       TextLabel lblActionPageLeftSignal;
+       TextLabel lblActionPageRightSignal;
+       TextLabel lblActionPageUpSignal;
+       TextLabel lblActionPageDownSignal;
+       TextLabel lblActionMoveToFirstSignal;
+       TextLabel lblActionMoveToLastSignal;
+
+       PushButton btnUp;
+       PushButton btnDown;
+
+       TableView mTableView;
+
+public:
+       TBTDaliAccessibilityManagerSwipeView(Application& mApplication, app_control_h _control);
+
+       bool onActionScrollUpSignal(AccessibilityManager& manager);
+       bool onActionScrollDownSignal(AccessibilityManager& manager);
+       bool onActionPageLeftSignal(AccessibilityManager& manager);
+       bool onActionPageRightSignal(AccessibilityManager& manager);
+       bool onActionPageUpSignal(AccessibilityManager& manager);
+       bool onActionPageDownSignal(AccessibilityManager& manager);
+       bool onActionMoveToFirstSignal(AccessibilityManager& manager);
+       bool onActionMoveToLastSignal(AccessibilityManager& manager);
+};
+
+#endif // __TBT_MODULE_APP_DALI_ACCESSIBILITY_MANAGER_SWIPE
+
diff --git a/tbtcoreapp-dali/inc/view/tbt-dali-accessibility-manager-tap-view.h b/tbtcoreapp-dali/inc/view/tbt-dali-accessibility-manager-tap-view.h
new file mode 100644 (file)
index 0000000..1defef9
--- /dev/null
@@ -0,0 +1,68 @@
+/*******************************************************************************
+ * 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-accessibility-manager-flick-view.h
+ * @brief      To test functionality of accessibility manager
+ *
+ * @author     Jahangir Alam(ja.alam@samsung.com)
+ * @date       November, 2016
+ * @credit
+ *
+ */
+
+#ifndef __TBT_MODULE_APP_DALI_ACCESSIBILITY_MANAGER_TAP
+#define __TBT_MODULE_APP_DALI_ACCESSIBILITY_MANAGER_TAP
+#include <dali.h>
+
+#include "utils/logger.h"
+#include "utils/config.h"
+#include "utils/ui-utils.h"
+#include "utils/dali-ui-utils.h"
+
+class TBTDaliAccessibilityManagerTapView: public UiUtils {
+
+private:
+       AccessibilityManager mAccessibilityManager;
+
+       TextLabel lblActionActivateSignal;
+       TextLabel lblActionReadSignal;
+       TextLabel lblActionReadFromTopSignal;
+       TextLabel lblActionReadFromNextSignal;
+       TextLabel lblActionZoomSignal;
+       TextLabel lblActionReadIndicatorInformationSignal;
+       TextLabel lblActionReadPauseResumeSignal;
+       TextLabel lblActionStartStopSignal;
+
+       PushButton btnUp;
+       PushButton btnDown;
+
+       TableView mTableView;
+
+public:
+       TBTDaliAccessibilityManagerTapView(Application& mApplication, app_control_h _control);
+
+       bool onActionActivateSignal(AccessibilityManager& manager);
+       bool onActionReadSignal(AccessibilityManager& manager);
+       bool onActionReadFromTopSignal(AccessibilityManager& manager);
+       bool onActionReadFromNextSignal(AccessibilityManager& manager);
+       bool onActionZoomSignal(AccessibilityManager& manager);
+       bool onActionReadIndicatorInformationSignal(AccessibilityManager& manager);
+       bool onActionReadPauseResumeSignal(AccessibilityManager& manager);
+       bool onActionStartStopSignal(AccessibilityManager& manager);
+};
+
+#endif // __TBT_MODULE_APP_DALI_ACCESSIBILITY_MANAGER_TAP
+
index a8f6f8e1de8f6347185f7527ad55a77de50dd1fa..399ce0052c7ad68852e543dc75d2a613a49180fe 100644 (file)
 #include "utils/logger.h"
 #include "utils/config.h"
 #include "utils/ui-utils.h"
-//#include "view/tbt-dali-common-view.h"
 #include "utils/dali-ui-utils.h"
 
 class TBTDaliAccessibilityManagerView: public UiUtils {
 
 private:
        AccessibilityManager mAccessibilityManager;
-       PushButton btnUp;
-       PushButton btnDown;
+
+//     PushButton btnUp;
+//     PushButton btnDown;
+       PushButton btnClear;
+
+       TextLabel lblFocusChangedSignal;
+       TextLabel lblFocusOvershotSignal;
+       TextLabel lblFocusedActorActivatedSignal;
+       TextLabel lblStatusChangedSignal;
+       TextLabel lblActionOverSignal;
+       TextLabel lblActionUpSignal;
+       TextLabel lblActionDownSignal;
+       TextLabel lblActionClearFocusSignal;
+       TextLabel lblActionBackSignal;
+       TextLabel lblActionScrollSignal;
+
+       Slider slider;
+
+       TableView mTableView;
 
 public:
        TBTDaliAccessibilityManagerView(Application& mApplication, app_control_h _control);
 
-       bool OnClick(Button button);
-       bool OnAccessibilityActionSignalType( AccessibilityManager& manager );
-       bool OnActionNextSignal(AccessibilityManager& manager);
+       //bool OnUpClick(Button button);
+       //bool OnDownClick(Button button);
+       bool OnClearClick(Button button);
+       void onFocusChangedSignal(Actor previous, Actor next);
+       void onFocusOvershotSignal(Actor actor, AccessibilityManager::FocusOvershotDirection director);
+       void onFocusedActorActivatedSignal(Actor actor);
+       bool onStatusChangedSignal(AccessibilityManager& manager);
+       bool onActionOverSignal(AccessibilityManager& manager);
+       bool onActionUpSignal(AccessibilityManager& manager);
+       bool onActionDownSignal(AccessibilityManager& manager);
+       bool onActionClearFocusSignal(AccessibilityManager& manager);
+       bool onActionBackSignal(AccessibilityManager& manager);
+       bool onActionScrollSignal(AccessibilityManager& manager, const Dali::TouchEvent& event);
 };
 
 #endif // __TBT_MODULE_APP_DALI_KEY_BOARD_FOCUS_MANAGER
index b9994f367e1d752fe306c544f041f428a2d3612c..bac4cde9c61f35fe165bb297422a7d56f3e3280f 100644 (file)
@@ -42,11 +42,11 @@ private:
        TextLabel lblFocusGroup;
        TextLabel lblFocusActor;
 
-       PushButton btnUp;
-       PushButton btnDown;
+       TextField txt_field1;
+       TextField txt_field2;
+       TextField txt_field3;
 
-       TextField txt_field;
-       TextEditor txt_editor;
+       TableView mTableView;
 
 public:
        TBTDaliKeyBoardFocusManagerView(Application& mApplication, app_control_h _control);
@@ -55,12 +55,9 @@ public:
        void OnFocusChanged(Actor current, Actor proposed);
        void OnFocusGroupChanged(Actor actor, bool bValue);
        void OnFocusedActorEnterKey(Actor actor);
-       bool OnUpClick(Button button);
-       bool OnDownClick(Button button);
-       void onTextChanged(TextEditor editor);
-       bool onKeyEventSignal(Control control, const KeyEvent& event);
-       bool OnButtonClick(Button button);
        bool OnButtonClick_1(Button button);
+       bool OnButtonClick_2(Button button);
+       bool OnButtonClick_3(Button button);
 };
 
 #endif // __TBT_MODULE_APP_DALI_KEY_BOARD_FOCUS_MANAGER
index 77a0fc9ace85e0cc3b8b2f954ef3479668c3c913..2c676ee55877e5a953f126980ba3c6f6ec70f2e7 100644 (file)
 #include <string.h>
 #include <dali.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <view/tbt-dali-accessibility-manager-view.h>
+#include <view/tbt-dali-accessibility-manager-flick-view.h>
+#include <view/tbt-dali-accessibility-manager-tap-view.h>
+#include <view/tbt-dali-accessibility-manager-swipe-view.h>
 #include "utils/logger.h"
 #include "view/tbt-dali-actor-view.h"
 #include "view/tbt-dali-stage-view.h"
@@ -37,7 +41,6 @@
 #include "view/tbt-dali-slider-view.h"
 #include "view/tbt-dali-text-control-view.h"
 #include "view/tbt-dali-keyboard-focus-manager-view.h"
-#include "view/tbt-dali-accessibility-manager-view.h"
 #include "view/tbt-dali-long-press-gesture-single-view.h"
 #include "view/tbt-dali-long-press-gesture-double-view.h"
 #include "view/tbt-dali-long-press-gesture-multiple-view.h"
@@ -146,6 +149,18 @@ public:
                        {
                                parentView = new TBTDaliAccessibilityManagerView(mApplication, _control);
                        }
+                       else if(strcmp(moduleName, "TBT_APP_DALI_ACCESSIBILITY_MANAGER_FLICK") == 0)
+                       {
+                               parentView = new TBTDaliAccessibilityManagerFlickView(mApplication, _control);
+                       }
+                       else if(strcmp(moduleName, "TBT_APP_DALI_ACCESSIBILITY_MANAGER_TAP") == 0)
+                       {
+                               parentView = new TBTDaliAccessibilityManagerTapView(mApplication, _control);
+                       }
+                       else if(strcmp(moduleName, "TBT_APP_DALI_ACCESSIBILITY_MANAGER_SWIPE") == 0)
+                       {
+                               parentView = new TBTDaliAccessibilityManagerSwipeView(mApplication, _control);
+                       }
                        else if(strcmp(moduleName, "TBT_APP_DALI_LONG_PRESS_GESTURE_SINGLE") == 0)
                        {
                                parentView = new TBTDaliLongPressGestureSingleView(mApplication, _control);
index 2dbbb18ebc97b8dbdbb29cfe0ee99111b0bfe7c6..ea00ea3cbd88626b4955c444e03dbbe04e38ffeb 100644 (file)
@@ -38,7 +38,7 @@ UiUtils::UiUtils(Application& application, app_control_h app_control) : mApplica
 }
 void UiUtils::Init(std::string title)
 {
-       DBG("UiUtils::Init....");
+       DBG("UiUtils::Init....Begin");
        Stage stage = Stage::GetCurrent();
        Vector2 stageSize=stage.GetSize();
        stage.SetBackgroundColor( Color::WHITE );
@@ -107,6 +107,7 @@ void UiUtils::Init(std::string title)
        this->btnInfoButton = this->CreateVerdictButton(this->tblVerdict, TableView::CellPosition(0, 2), AnchorPoint::TOP_LEFT, Vector2(0.0f, 0.0f), "Info", this, &UiUtils::OnInfoButtonClick, Vector4(0.55f, 0.8f, 0.9f, 1.0f), Vector4(0.8f, 0.9f, 0.9f, 1.0f),size);
 
        Stage::GetCurrent().KeyEventSignal().Connect( this, &UiUtils::OnKeyEvent );
+       DBG("UiUtils::Init.... End");
 }
 
 template<class X, typename Ret, typename Arg0>
@@ -262,6 +263,40 @@ void UiUtils::CreateLabelList(Property::Map keyMap, Property::Map sizeMap)
        //return textlabelMap;
 }
 
+void UiUtils::AddLabelToTable(TableView table,Property::Map keyMap, Property::Map sizeMap)
+{
+       DBG("UiUtils::AddLabelToTable Begin");
+       //Dali::Property::Map textlabelMap;
+       std::string key;
+       Property::Value value;
+       Property::Value size_value;
+       Vector2 size;
+       Vector2 position;
+       int count=keyMap.Count();
+       float next=Stage::GetCurrent().GetSize().height*0.039;
+       TextLabel lbl;
+       for(int i=0;i<count;i++)
+       {
+               key=keyMap.GetKey(i);
+               value=keyMap.GetValue(i);
+               size_value=sizeMap.GetValue(i);
+               size=size_value.Get<Vector2>();
+               position=Vector2(0.0f, next);
+               lbl=this->CreateTextLabel(AnchorPoint::TOP_LEFT, ParentOrigin::TOP_LEFT,position,value.Get<std::string>(),size);
+               lbl.SetProperty( TextLabel::Property::POINT_SIZE, 8);
+               lbl.SetProperty( TextLabel::Property::TEXT_COLOR, Color::RED);
+               lbl.SetProperty( TextLabel::Property::VERTICAL_ALIGNMENT, "TOP");
+               lbl.SetProperty( TextLabel::Property::HORIZONTAL_ALIGNMENT, "BEGIN");
+               lbl.SetName(value.Get<std::string>());
+
+               table.AddChild(lbl,TableView::CellPosition(i,0));
+
+               next=next+size.y;
+       }
+       DBG("UiUtils::AddLabelToTable End");
+       //return textlabelMap;
+}
+
 bool UiUtils::OnPassButtonClick(Button button)
 {
        DBG("UiUtils::OnPassButtonClick");
@@ -329,7 +364,7 @@ void UiUtils::FillInfoPage(std::string content)
        lblText.SetAnchorPoint(AnchorPoint::TOP_LEFT);
        lblText.SetParentOrigin(ParentOrigin::TOP_LEFT);
        lblText.SetSize(bodySize);
-       lblText.SetProperty(TextLabel::Property::POINT_SIZE,10.0f);
+       lblText.SetProperty(TextLabel::Property::POINT_SIZE,7.0f);
        lblText.SetProperty(TextLabel::Property::TEXT_COLOR,Color::BLACK);
        lblText.SetPosition(0.0f, 0.0f);
 
diff --git a/tbtcoreapp-dali/src/view/tbt-dali-accessibilty-manager-flick-view.cpp b/tbtcoreapp-dali/src/view/tbt-dali-accessibilty-manager-flick-view.cpp
new file mode 100644 (file)
index 0000000..5139832
--- /dev/null
@@ -0,0 +1,159 @@
+/*******************************************************************************
+ * 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-accessibility-manager-flick-view.cpp
+ * @brief      To test functionality of dali accessibility manager
+ *
+ * @author     Jahangir Alam(ja.alam@samsung.com)
+ * @date       November, 2016
+ * @credit
+ *
+ */
+
+#include <view/tbt-dali-accessibility-manager-flick-view.h>
+
+TBTDaliAccessibilityManagerFlickView::TBTDaliAccessibilityManagerFlickView(Application& mApplication, app_control_h _control) :
+       UiUtils(mApplication, _control) {
+
+       Init("Accessibility Manager Flick");
+       mInfoText=std::string("")+
+                       "\nTo perform the test:"
+                       "\n1.   Run tbtcoreapp"
+                       "\n2.   Activate the accessibility by run <color value='blue'><b>sh-3.2#</b> vconftool set -f -t bool db/setting/accessibility/tts 1</color>"
+                       " on target shell with root on mode"
+                       "\n3.   One finger single tap on DALi Accessibility Manager Flick. Then focused this with yellow box"
+                       "\n4.   One finger double tap on DALi Accessibility Manager Flick."
+                       "\n5.   One finger flick up/down on screen to change the focus control then action next and action previous signal will call."
+                       "\n6.   One finger flick right/left on screen to change the focus control then action read next and action read previous signal will call."
+                       "\n7.   Before finished test deactivate the accessibility by run <color value='blue'><b>sh-3.2#</b> vconftool set -f -t bool db/setting/accessibility/tts 0</color>"
+                       "\n8.   If the corresponding event signals "
+                       "mgs are changed then press <color value='green'><b>Pass</b></color>. "
+                       "Otherwise, press <color value='red'><b>Fail</b></color>.";
+
+       Stage stage = Stage::GetCurrent();
+       Vector2 stageSize = stage.GetSize();
+
+       mAccessibilityManager = AccessibilityManager::Get();
+
+       mAccessibilityManager.ActionNextSignal().Connect(this,&TBTDaliAccessibilityManagerFlickView::onActionNextSignal);
+       mAccessibilityManager.ActionPreviousSignal().Connect(this,&TBTDaliAccessibilityManagerFlickView::onActionPreviousSignal);
+       mAccessibilityManager.ActionReadNextSignal().Connect(this,&TBTDaliAccessibilityManagerFlickView::onActionReadNextSignal);
+       mAccessibilityManager.ActionReadPreviousSignal().Connect(this,&TBTDaliAccessibilityManagerFlickView::onActionReadPreviousSignal);
+
+       mTableView=TableView::New(12,1);
+       mTableView.SetAnchorPoint(AnchorPoint::TOP_LEFT);
+       mTableView.SetParentOrigin(ParentOrigin::TOP_LEFT);
+       mTableView.SetSize(this->bodySize);
+       mTableView.SetPosition(0.0f, 0.0f);
+       this->ctlBody.Add(mTableView);
+
+       Property::Map ctl;
+       Property::Map size;
+
+       ctl["lbl1"]="   Action next signal not call";
+       ctl["lbl2"]="   Action previous signal not call";
+       ctl["lbl3"]="   Action Read Next Signal not call";
+       ctl["lbl4"]="   Action Read Previous 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);
+
+       //CreateLabelList(ctl,size);
+       AddLabelToTable(mTableView,ctl,size);
+
+       DBG("Count >>>>>> %d",ctlBody.GetChildCount());
+       int count=mTableView.GetChildCount();
+       DBG("TableView Child Count >>>>>> %d",count);
+
+       lblActionNextSignal=TextLabel::DownCast(mTableView.GetChildAt(0));
+       lblActionPreviousSignal=TextLabel::DownCast(mTableView.GetChildAt(1));
+       lblActionReadNextSignal=TextLabel::DownCast(mTableView.GetChildAt(2));
+       lblActionReadPreviousSignal=TextLabel::DownCast(mTableView.GetChildAt(3));
+
+       mTableView.AddChild(lblActionNextSignal, TableView::CellPosition(0,0));
+       mTableView.AddChild(lblActionPreviousSignal, TableView::CellPosition(1,0));
+       mTableView.AddChild(lblActionReadNextSignal, TableView::CellPosition(2,0));
+       mTableView.AddChild(lblActionReadPreviousSignal, TableView::CellPosition(3,0));
+
+       mAccessibilityManager.SetFocusOrder(lblActionNextSignal,1);
+       mAccessibilityManager.SetFocusOrder(lblActionPreviousSignal,2);
+       mAccessibilityManager.SetFocusOrder(lblActionReadNextSignal,3);
+       mAccessibilityManager.SetFocusOrder(lblActionReadPreviousSignal,4);
+
+       if(! mAccessibilityManager.SetCurrentFocusActor(lblActionNextSignal))
+               DBG("unable to set current focus actor");
+
+       Vector2 buttonSize=Vector2(bodySize.width, BUTTON_HEIGHT*bodySize.height);
+       Vector2 pos=Vector2(0.0f, 0.0f);
+
+       btnUp=CreateButton(AnchorPoint::TOP_LEFT, pos, "Test Button 1", selectedColor, unSelectedColor, buttonSize);
+       btnUp.ClickedSignal().Connect(this,&TBTDaliAccessibilityManagerFlickView::OnUpClick);
+       mAccessibilityManager.SetFocusOrder( btnUp, mAccessibilityManager.GenerateNewFocusOrder());
+
+       btnDown=CreateButton(AnchorPoint::TOP_LEFT, pos, "Test Button 2", selectedColor, unSelectedColor, buttonSize);
+       btnDown.ClickedSignal().Connect(this,&TBTDaliAccessibilityManagerFlickView::OnDownClick);
+       mAccessibilityManager.SetFocusOrder( btnDown, mAccessibilityManager.GenerateNewFocusOrder() );
+
+       mTableView.AddChild(btnUp, TableView::CellPosition(8,0));
+       mTableView.AddChild(btnDown, TableView::CellPosition(10,0));
+}
+
+bool TBTDaliAccessibilityManagerFlickView::OnUpClick(Button button)
+{
+       DBG("In TBTDaliAccessibilityManagerFlickView::OnUpClick");
+       bool bPrev=mAccessibilityManager.MoveFocusBackward();
+       return true;
+}
+bool TBTDaliAccessibilityManagerFlickView::OnDownClick(Button button)
+{
+       DBG("In TBTDaliAccessibilityManagerFlickView::OnDownClick");
+       return true;
+}
+
+bool TBTDaliAccessibilityManagerFlickView::onActionNextSignal(AccessibilityManager& manager)
+{
+       DBG("In TBTDaliAccessibilityManagerFlickView::onActionNextSignal");
+       //mAccessibilityManager.SetCurrentFocusActor(next);
+       lblActionNextSignal.SetProperty(TextLabel::Property::TEXT,"    Action Next Signal called");
+       lblActionNextSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       return true;
+}
+bool TBTDaliAccessibilityManagerFlickView::onActionPreviousSignal(AccessibilityManager& manager)
+{
+       DBG("In TBTDaliAccessibilityManagerFlickView::onActionPreviousSignal");
+       lblActionPreviousSignal.SetProperty(TextLabel::Property::TEXT,"    Action Previous Signal called");
+       lblActionPreviousSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       return true;
+}
+
+bool TBTDaliAccessibilityManagerFlickView::onActionReadNextSignal(AccessibilityManager& manager)
+{
+       DBG("In TBTDaliAccessibilityManagerFlickView::onActionReadNextSignal");
+       lblActionReadNextSignal.SetProperty(TextLabel::Property::TEXT,"    Action Read Next Signal called");
+       lblActionReadNextSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       return true;
+}
+bool TBTDaliAccessibilityManagerFlickView::onActionReadPreviousSignal(AccessibilityManager& manager)
+{
+       DBG("In TBTDaliAccessibilityManagerFlickView::onActionReadPreviousSignal");
+       lblActionReadPreviousSignal.SetProperty(TextLabel::Property::TEXT,"    Action Read Previous Signal called");
+       lblActionReadPreviousSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       return true;
+}
+
+
diff --git a/tbtcoreapp-dali/src/view/tbt-dali-accessibilty-manager-swipe-view.cpp b/tbtcoreapp-dali/src/view/tbt-dali-accessibilty-manager-swipe-view.cpp
new file mode 100644 (file)
index 0000000..948ed14
--- /dev/null
@@ -0,0 +1,188 @@
+/*******************************************************************************
+ * 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-accessibility-manager-flick-view.cpp
+ * @brief      To test functionality of dali accessibility manager
+ *
+ * @author     Jahangir Alam(ja.alam@samsung.com)
+ * @date       November, 2016
+ * @credit
+ *
+ */
+
+#include <view/tbt-dali-accessibility-manager-swipe-view.h>
+
+TBTDaliAccessibilityManagerSwipeView::TBTDaliAccessibilityManagerSwipeView(Application& mApplication, app_control_h _control) :
+       UiUtils(mApplication, _control) {
+
+       Init("Accessibility Manager Tap");
+       mInfoText=std::string("")+
+                       "\nTo perform the test:"
+                       "\n1.   Run tbtcoreapp"
+                       "\n2.   Activate the accessibility by run <color value='blue'><b>sh-3.2#</b> vconftool set -f -t bool db/setting/accessibility/tts 1</color>"
+                       " on target shell with root on mode"
+                       "\n3.   One finger single tap on DALi Accessibility Manager Tap. Then focused this with yellow box"
+                       "\n4.   One finger double tap on DALi Accessibility Manager Tap."
+                       "\n5.   One finger up/down on screen focus control are move then action read signal will call"
+                       "\n6.   One finger double tap on focused control then action activate signal will call."
+                       "\n7.   Three finger single tap on screen then action read from top signal will call."
+                       "\n8.   Three finger double tap on screen then action read from next signal will call."
+                       "\n9.   One finger triple tap on screen then action zoom signal will call."
+                       "\n10.  Two fingers triple tap on screen then action read indicator information signal will call"
+                       "\n11.  Two fingers single tap on screen then action read pause resume signal will call"
+                       "\n12.  Two finger double tap on screen then action start stop signal will call"
+                       "\n13.  One finger flick right/left on screen to change the focus control then action read next and action read previous signal will call."
+                       "\n14.  Before finished test deactivate the accessibility by run <color value='blue'><b>sh-3.2#</b> vconftool set -f -t bool db/setting/accessibility/tts 0</color>"
+                       "\n15.  If the corresponding event signals "
+                       "mgs are changed then press <color value='green'><b>Pass</b></color>. "
+                       "Otherwise, press <color value='red'><b>Fail</b></color>.";
+
+       Stage stage = Stage::GetCurrent();
+       Vector2 stageSize = stage.GetSize();
+
+       mAccessibilityManager = AccessibilityManager::Get();
+
+       mAccessibilityManager.ActionScrollUpSignal().Connect(this,&TBTDaliAccessibilityManagerSwipeView::onActionScrollUpSignal);
+       mAccessibilityManager.ActionScrollDownSignal().Connect(this,&TBTDaliAccessibilityManagerSwipeView::onActionScrollDownSignal);
+       mAccessibilityManager.ActionPageLeftSignal().Connect(this,&TBTDaliAccessibilityManagerSwipeView::onActionPageLeftSignal);
+       mAccessibilityManager.ActionPageRightSignal().Connect(this,&TBTDaliAccessibilityManagerSwipeView::onActionPageRightSignal);
+       mAccessibilityManager.ActionPageUpSignal().Connect(this,&TBTDaliAccessibilityManagerSwipeView::onActionPageUpSignal);
+       mAccessibilityManager.ActionPageDownSignal().Connect(this,&TBTDaliAccessibilityManagerSwipeView::onActionPageDownSignal);
+       mAccessibilityManager.ActionReadIndicatorInformationSignal().Connect(this,&TBTDaliAccessibilityManagerSwipeView::onActionMoveToFirstSignal);
+       mAccessibilityManager.ActionMoveToLastSignal().Connect(this,&TBTDaliAccessibilityManagerSwipeView::onActionMoveToLastSignal);
+
+       mTableView=TableView::New(12,1);
+       mTableView.SetAnchorPoint(AnchorPoint::TOP_LEFT);
+       mTableView.SetParentOrigin(ParentOrigin::TOP_LEFT);
+       mTableView.SetSize(this->bodySize);
+       mTableView.SetPosition(0.0f, 0.0f);
+       this->ctlBody.Add(mTableView);
+
+       Property::Map ctl;
+       Property::Map size;
+
+       ctl["lbl1"]="   Action scroll up signal not call";
+       ctl["lbl2"]="   Action scroll down signal not call";
+       ctl["lbl3"]="   Action page left signal not call";
+       ctl["lbl4"]="   Action page right signal not call";
+       ctl["lbl5"]="   Action page up signal not call";
+       ctl["lbl6"]="   Action page down signal not call";
+       ctl["lbl7"]="   Action move to first signal not call";
+       ctl["lbl8"]="   Action move to last 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);
+       size["lbl5"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+       size["lbl6"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+       size["lbl7"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+       size["lbl8"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+
+       //CreateLabelList(ctl,size);
+       AddLabelToTable(mTableView,ctl,size);
+
+       DBG("Count >>>>>> %d",ctlBody.GetChildCount());
+       int count=mTableView.GetChildCount();
+       DBG("TableView Child Count >>>>>> %d",count);
+
+       lblActionScrollUpSignal=TextLabel::DownCast(mTableView.GetChildAt(0));
+       lblActionScrollDownSignal=TextLabel::DownCast(mTableView.GetChildAt(1));
+       lblActionPageLeftSignal=TextLabel::DownCast(mTableView.GetChildAt(2));
+       lblActionPageRightSignal=TextLabel::DownCast(mTableView.GetChildAt(3));
+       lblActionPageUpSignal=TextLabel::DownCast(mTableView.GetChildAt(4));
+       lblActionPageDownSignal=TextLabel::DownCast(mTableView.GetChildAt(5));
+       lblActionMoveToFirstSignal=TextLabel::DownCast(mTableView.GetChildAt(6));
+       lblActionMoveToLastSignal=TextLabel::DownCast(mTableView.GetChildAt(7));
+
+       mTableView.AddChild(lblActionScrollUpSignal, TableView::CellPosition(0,0));
+       mTableView.AddChild(lblActionScrollDownSignal, TableView::CellPosition(1,0));
+       mTableView.AddChild(lblActionPageLeftSignal, TableView::CellPosition(2,0));
+       mTableView.AddChild(lblActionPageRightSignal, TableView::CellPosition(3,0));
+       mTableView.AddChild(lblActionPageUpSignal, TableView::CellPosition(4,0));
+       mTableView.AddChild(lblActionPageDownSignal, TableView::CellPosition(5,0));
+       mTableView.AddChild(lblActionMoveToFirstSignal, TableView::CellPosition(6,0));
+       mTableView.AddChild(lblActionMoveToLastSignal, TableView::CellPosition(7,0));
+
+       mAccessibilityManager.SetFocusOrder(lblActionScrollUpSignal,1);
+       mAccessibilityManager.SetFocusOrder(lblActionScrollDownSignal,2);
+       mAccessibilityManager.SetFocusOrder(lblActionPageLeftSignal,3);
+       mAccessibilityManager.SetFocusOrder(lblActionPageRightSignal,4);
+       mAccessibilityManager.SetFocusOrder(lblActionPageUpSignal,5);
+       mAccessibilityManager.SetFocusOrder(lblActionPageDownSignal,6);
+       mAccessibilityManager.SetFocusOrder(lblActionMoveToFirstSignal,7);
+       mAccessibilityManager.SetFocusOrder(lblActionMoveToLastSignal,8);
+
+       if(! mAccessibilityManager.SetCurrentFocusActor(lblActionScrollUpSignal))
+               DBG("unable to set current focus actor");
+}
+
+bool TBTDaliAccessibilityManagerSwipeView::onActionScrollUpSignal(AccessibilityManager& manager)
+{
+       DBG("In TBTDaliAccessibilityManagerSwipeView::onActionScrollUpSignal");
+       lblActionScrollUpSignal.SetProperty(TextLabel::Property::TEXT,"    Action Scroll Up Signal called");
+       lblActionScrollUpSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       return true;
+}
+bool TBTDaliAccessibilityManagerSwipeView::onActionScrollDownSignal(AccessibilityManager& manager)
+{
+       DBG("In TBTDaliAccessibilityManagerSwipeView::onActionScrollDownSignal");
+       lblActionScrollDownSignal.SetProperty(TextLabel::Property::TEXT,"    Action Scroll Down Signal called");
+       lblActionScrollDownSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       return true;
+}
+bool TBTDaliAccessibilityManagerSwipeView::onActionPageLeftSignal(AccessibilityManager& manager)
+{
+       DBG("In TBTDaliAccessibilityManagerSwipeView::onActionPageLeftSignal");
+       lblActionPageLeftSignal.SetProperty(TextLabel::Property::TEXT,"    Action Page Left Signal called");
+       lblActionPageLeftSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       return true;
+}
+bool TBTDaliAccessibilityManagerSwipeView::onActionPageRightSignal(AccessibilityManager& manager)
+{
+       DBG("In TBTDaliAccessibilityManagerSwipeView::onActionPageRightSignal");
+       lblActionPageRightSignal.SetProperty(TextLabel::Property::TEXT,"    Action Page Right Signal called");
+       lblActionPageRightSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       return true;
+}
+bool TBTDaliAccessibilityManagerSwipeView::onActionPageUpSignal(AccessibilityManager& manager)
+{
+       DBG("In TBTDaliAccessibilityManagerSwipeView::onActionPageUpSignal");
+       lblActionPageUpSignal.SetProperty(TextLabel::Property::TEXT,"    Action Page Up Signal called");
+       lblActionPageUpSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       return true;
+}
+bool TBTDaliAccessibilityManagerSwipeView::onActionPageDownSignal(AccessibilityManager& manager)
+{
+       DBG("In TBTDaliAccessibilityManagerSwipeView::onActionPageDownSignal");
+       lblActionPageDownSignal.SetProperty(TextLabel::Property::TEXT,"    Action Page Down Signal called");
+       lblActionPageDownSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       return true;
+}
+bool TBTDaliAccessibilityManagerSwipeView::onActionMoveToFirstSignal(AccessibilityManager& manager)
+{
+       DBG("In TBTDaliAccessibilityManagerSwipeView::onActionMoveToFirstSignal");
+       lblActionMoveToFirstSignal.SetProperty(TextLabel::Property::TEXT,"    Action Move To First Signal called");
+       lblActionMoveToFirstSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       return true;
+}
+bool TBTDaliAccessibilityManagerSwipeView::onActionMoveToLastSignal(AccessibilityManager& manager)
+{
+       DBG("In TBTDaliAccessibilityManagerSwipeView::onActionMoveToLastSignal");
+       lblActionMoveToLastSignal.SetProperty(TextLabel::Property::TEXT,"    Action Move To Last Signal called");
+       lblActionMoveToLastSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       return true;
+}
diff --git a/tbtcoreapp-dali/src/view/tbt-dali-accessibilty-manager-tap-view.cpp b/tbtcoreapp-dali/src/view/tbt-dali-accessibilty-manager-tap-view.cpp
new file mode 100644 (file)
index 0000000..e90765f
--- /dev/null
@@ -0,0 +1,189 @@
+/*******************************************************************************
+ * 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-accessibility-manager-flick-view.cpp
+ * @brief      To test functionality of dali accessibility manager
+ *
+ * @author     Jahangir Alam(ja.alam@samsung.com)
+ * @date       November, 2016
+ * @credit
+ *
+ */
+
+#include <view/tbt-dali-accessibility-manager-tap-view.h>
+
+TBTDaliAccessibilityManagerTapView::TBTDaliAccessibilityManagerTapView(Application& mApplication, app_control_h _control) :
+       UiUtils(mApplication, _control) {
+
+       Init("Accessibility Manager Tap");
+       mInfoText=std::string("")+
+                       "\nTo perform the test:"
+                       "\n1.   Run tbtcoreapp"
+                       "\n2.   Activate the accessibility by run <color value='blue'><b>sh-3.2#</b> vconftool set -f -t bool db/setting/accessibility/tts 1</color>"
+                       " on target shell with root on mode"
+                       "\n3.   One finger single tap on DALi Accessibility Manager Tap. Then focused this with yellow box"
+                       "\n4.   One finger double tap on DALi Accessibility Manager Tap."
+                       "\n5.   One finger up/down on screen focus control are move then action read signal will call"
+                       "\n6.   One finger double tap on focused control then action activate signal will call."
+                       "\n7.   One finger triple tap on screen then action zoom signal will call."
+                       "\n8.   Two fingers triple tap on screen then action read indicator information signal will call"
+                       "\n9.   Two fingers single tap on screen then action read pause resume signal will call"
+                       "\n10.  Two finger double tap on screen then action start stop signal will call"
+                       "\n11.  One finger flick right/left on screen to change the focus control then action read next and action read previous signal will call."
+                       //"\n12.   Three finger single tap on screen then action read from top signal will call."
+                       //"\n13.   Three finger double tap on screen then action read from next signal will call."
+                       "\n12.  Before finished test deactivate the accessibility by run <color value='blue'><b>sh-3.2#</b> vconftool set -f -t bool db/setting/accessibility/tts 0</color>"
+                       "\n13.  If the corresponding event signals "
+                       "mgs are changed then press <color value='green'><b>Pass</b></color>. "
+                       "Otherwise, press <color value='red'><b>Fail</b></color>.";
+
+       Stage stage = Stage::GetCurrent();
+       Vector2 stageSize = stage.GetSize();
+
+       mAccessibilityManager = AccessibilityManager::Get();
+
+       mAccessibilityManager.ActionActivateSignal().Connect(this,&TBTDaliAccessibilityManagerTapView::onActionActivateSignal);
+       mAccessibilityManager.ActionReadSignal().Connect(this,&TBTDaliAccessibilityManagerTapView::onActionReadSignal);
+       mAccessibilityManager.ActionReadFromTopSignal().Connect(this,&TBTDaliAccessibilityManagerTapView::onActionReadFromTopSignal);
+       mAccessibilityManager.ActionReadFromNextSignal().Connect(this,&TBTDaliAccessibilityManagerTapView::onActionReadFromNextSignal);
+       mAccessibilityManager.ActionZoomSignal().Connect(this,&TBTDaliAccessibilityManagerTapView::onActionZoomSignal);
+       mAccessibilityManager.ActionReadIndicatorInformationSignal().Connect(this,&TBTDaliAccessibilityManagerTapView::onActionReadIndicatorInformationSignal);
+       mAccessibilityManager.ActionReadPauseResumeSignal().Connect(this,&TBTDaliAccessibilityManagerTapView::onActionReadPauseResumeSignal);
+       mAccessibilityManager.ActionStartStopSignal().Connect(this,&TBTDaliAccessibilityManagerTapView::onActionStartStopSignal);
+
+       mTableView=TableView::New(12,1);
+       mTableView.SetAnchorPoint(AnchorPoint::TOP_LEFT);
+       mTableView.SetParentOrigin(ParentOrigin::TOP_LEFT);
+       mTableView.SetSize(this->bodySize);
+       mTableView.SetPosition(0.0f, 0.0f);
+       this->ctlBody.Add(mTableView);
+
+       Property::Map ctl;
+       Property::Map size;
+
+       ctl["lbl1"]="   Action activate signal not call";
+       ctl["lbl2"]="   Action read signal not call";
+       ctl["lbl3"]="   Action zoom signal not call";
+       ctl["lbl4"]="   Action read indicator information signal not call";
+       ctl["lbl5"]="   Action read pause resume signal not call";
+       ctl["lbl6"]="   Action start stop signal not call";
+//     ctl["lbl7"]="   Action read from top signal not call";
+//     ctl["lbl8"]="   Action read from next 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);
+       size["lbl5"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+       size["lbl6"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+//     size["lbl7"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+//     size["lbl8"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+
+       //CreateLabelList(ctl,size);
+       AddLabelToTable(mTableView,ctl,size);
+
+       DBG("Count >>>>>> %d",ctlBody.GetChildCount());
+       int count=mTableView.GetChildCount();
+       DBG("TableView Child Count >>>>>> %d",count);
+
+       lblActionActivateSignal=TextLabel::DownCast(mTableView.GetChildAt(0));
+       lblActionReadSignal=TextLabel::DownCast(mTableView.GetChildAt(1));
+       lblActionZoomSignal=TextLabel::DownCast(mTableView.GetChildAt(2));
+       lblActionReadIndicatorInformationSignal=TextLabel::DownCast(mTableView.GetChildAt(3));
+       lblActionReadPauseResumeSignal=TextLabel::DownCast(mTableView.GetChildAt(4));
+       lblActionStartStopSignal=TextLabel::DownCast(mTableView.GetChildAt(5));
+//     lblActionReadFromTopSignal=TextLabel::DownCast(mTableView.GetChildAt(6));
+//     lblActionReadFromNextSignal=TextLabel::DownCast(mTableView.GetChildAt(7));
+
+       mTableView.AddChild(lblActionActivateSignal, TableView::CellPosition(0,0));
+       mTableView.AddChild(lblActionReadSignal, TableView::CellPosition(1,0));
+       mTableView.AddChild(lblActionZoomSignal, TableView::CellPosition(2,0));
+       mTableView.AddChild(lblActionReadIndicatorInformationSignal, TableView::CellPosition(3,0));
+       mTableView.AddChild(lblActionReadPauseResumeSignal, TableView::CellPosition(4,0));
+       mTableView.AddChild(lblActionStartStopSignal, TableView::CellPosition(5,0));
+//     mTableView.AddChild(lblActionReadFromTopSignal, TableView::CellPosition(6,0));
+//     mTableView.AddChild(lblActionReadFromNextSignal, TableView::CellPosition(7,0));
+
+       mAccessibilityManager.SetFocusOrder(lblActionActivateSignal,1);
+       mAccessibilityManager.SetFocusOrder(lblActionReadSignal,mAccessibilityManager.GenerateNewFocusOrder());
+       mAccessibilityManager.SetFocusOrder(lblActionZoomSignal,mAccessibilityManager.GenerateNewFocusOrder());
+       mAccessibilityManager.SetFocusOrder(lblActionReadIndicatorInformationSignal,mAccessibilityManager.GenerateNewFocusOrder());
+       mAccessibilityManager.SetFocusOrder(lblActionReadPauseResumeSignal,mAccessibilityManager.GenerateNewFocusOrder());
+       mAccessibilityManager.SetFocusOrder(lblActionStartStopSignal,mAccessibilityManager.GenerateNewFocusOrder());
+//     mAccessibilityManager.SetFocusOrder(lblActionReadFromTopSignal,mAccessibilityManager.GenerateNewFocusOrder());
+//     mAccessibilityManager.SetFocusOrder(lblActionReadFromNextSignal,mAccessibilityManager.GenerateNewFocusOrder());
+
+       if(! mAccessibilityManager.SetCurrentFocusActor(lblActionActivateSignal))
+               DBG("unable to set current focus actor");
+}
+
+bool TBTDaliAccessibilityManagerTapView::onActionActivateSignal(AccessibilityManager& manager)
+{
+       DBG("In TBTDaliAccessibilityManagerTapView::onActionActivateSignal");
+       lblActionActivateSignal.SetProperty(TextLabel::Property::TEXT,"    Action Activate Signal called");
+       lblActionActivateSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       return true;
+}
+bool TBTDaliAccessibilityManagerTapView::onActionReadSignal(AccessibilityManager& manager)
+{
+       DBG("In TBTDaliAccessibilityManagerTapView::onActionReadSignal");
+       lblActionReadSignal.SetProperty(TextLabel::Property::TEXT,"    Action Read Signal called");
+       lblActionReadSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       return true;
+}
+bool TBTDaliAccessibilityManagerTapView::onActionReadFromTopSignal(AccessibilityManager& manager)
+{
+       DBG("In TBTDaliAccessibilityManagerTapView::onFocusedActorActivatedSignal");
+//     lblActionReadFromTopSignal.SetProperty(TextLabel::Property::TEXT,"    Action Read From Top Signal called");
+//     lblActionReadFromTopSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       return true;
+}
+bool TBTDaliAccessibilityManagerTapView::onActionReadFromNextSignal(AccessibilityManager& manager)
+{
+       DBG("In TBTDaliAccessibilityManagerTapView::onActionReadFromNextSignal");
+//     lblActionReadFromNextSignal.SetProperty(TextLabel::Property::TEXT,"    Action Read From Next Signal called");
+//     lblActionReadFromNextSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       return true;
+}
+bool TBTDaliAccessibilityManagerTapView::onActionZoomSignal(AccessibilityManager& manager)
+{
+       DBG("In TBTDaliAccessibilityManagerTapView::onActionZoomSignal");
+       lblActionZoomSignal.SetProperty(TextLabel::Property::TEXT,"    Action Zoom Signal called");
+       lblActionZoomSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       return true;
+}
+bool TBTDaliAccessibilityManagerTapView::onActionReadIndicatorInformationSignal(AccessibilityManager& manager)
+{
+       DBG("In TBTDaliAccessibilityManagerTapView::onActionReadIndicatorInformationSignal");
+       lblActionReadIndicatorInformationSignal.SetProperty(TextLabel::Property::TEXT,"    Action Read Indicator Information Signal called");
+       lblActionReadIndicatorInformationSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       return true;
+}
+bool TBTDaliAccessibilityManagerTapView::onActionReadPauseResumeSignal(AccessibilityManager& manager)
+{
+       DBG("In TBTDaliAccessibilityManagerTapView::onActionReadPauseResumeSignal");
+       lblActionReadPauseResumeSignal.SetProperty(TextLabel::Property::TEXT,"    Action Read Pause Resume Signal called");
+       lblActionReadPauseResumeSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       return true;
+}
+bool TBTDaliAccessibilityManagerTapView::onActionStartStopSignal(AccessibilityManager& manager)
+{
+       DBG("In TBTDaliAccessibilityManagerTapView::onActionStartStopSignal");
+       lblActionStartStopSignal.SetProperty(TextLabel::Property::TEXT,"    Action Start Stop Signal called");
+       lblActionStartStopSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       return true;
+}
index 0a374da63f97c9ccd6d38b0c62bb6daa259db3bf..1ce321d8320bcac1d836bc36b43a80c41e6753b9 100644 (file)
@@ -23,7 +23,7 @@
  *
  */
 
-#include "view/tbt-dali-accessibility-manager-view.h"
+#include <view/tbt-dali-accessibility-manager-view.h>
 
 TBTDaliAccessibilityManagerView::TBTDaliAccessibilityManagerView(Application& mApplication, app_control_h _control) :
        UiUtils(mApplication, _control) {
@@ -31,9 +31,23 @@ TBTDaliAccessibilityManagerView::TBTDaliAccessibilityManagerView(Application& mA
        Init("Accessibility Manager");
        mInfoText=std::string("")+
                        "\nTo perform the test:"
-                       "\n1.   Run DALi Accessibility Manager."
-                       "\n2.   Press Up/Down button to change the focus control."
-                       "\n3.   If the corresponding event signals "
+                       "\n1.   Run tbtcoreapp"
+                       "\n2.   Activate the accessibility by run <color value='blue'><b>sh-3.2#</b> vconftool set -f -t bool db/setting/accessibility/tts 1</color>"
+                       " on target shell with root on mode"
+                       "\n3.   One finger single tap on DALi Accessibility Manager. Then focused this with yellow box"
+                       "\n4.   One finger double tap on DALi Accessibility Manager."
+                       "\n5.   One finger swipe up/down on screen to change the focus control and then focus change signal will call"
+                       "\n6.   One finger swipe down until last control to select then again swipe down then focus overshot signal call"
+                       "\n7.   One Finger single/double tap on selected control then focused actor activated signal will call"
+//                     "\n8.   One finger move on screen then action over signal will call"
+//                     "\n9.   Double finger down and move up and right then action up signal will call"
+//                     "\n10.  Double finger down and move down and left then action down signal will call"
+//                     "\n11.  Clear the focus control then action clear focus signal will call"
+//                     "\n12.  Two fingers circle draw on screen then action back signal will call"
+                       "\n8.  Two fingers drag on screen then action scroll signal will call"
+                       "\n9.  Deactivate the accessibility by run <color value='blue'><b>sh-3.2#</b> vconftool set -f -t bool db/setting/accessibility/tts 0</color>"
+                       "\n10  After deactivate status changed signal will call"
+                       "\n11. If the corresponding event signals "
                        "mgs are changed then press <color value='green'><b>Pass</b></color>. "
                        "Otherwise, press <color value='red'><b>Fail</b></color>.";
 
@@ -42,53 +56,190 @@ TBTDaliAccessibilityManagerView::TBTDaliAccessibilityManagerView(Application& mA
 
        mAccessibilityManager = AccessibilityManager::Get();
 
+       mAccessibilityManager.FocusChangedSignal().Connect(this,&TBTDaliAccessibilityManagerView::onFocusChangedSignal);
+       mAccessibilityManager.FocusOvershotSignal().Connect(this,&TBTDaliAccessibilityManagerView::onFocusOvershotSignal);
+       mAccessibilityManager.FocusedActorActivatedSignal().Connect(this,&TBTDaliAccessibilityManagerView::onFocusedActorActivatedSignal);
+       mAccessibilityManager.StatusChangedSignal().Connect(this,&TBTDaliAccessibilityManagerView::onStatusChangedSignal);
+       mAccessibilityManager.ActionOverSignal().Connect(this,&TBTDaliAccessibilityManagerView::onActionOverSignal);
+       mAccessibilityManager.ActionUpSignal().Connect(this,&TBTDaliAccessibilityManagerView::onActionUpSignal);
+       mAccessibilityManager.ActionDownSignal().Connect(this,&TBTDaliAccessibilityManagerView::onActionDownSignal);
+       mAccessibilityManager.ActionClearFocusSignal().Connect(this,&TBTDaliAccessibilityManagerView::onActionClearFocusSignal);
+       mAccessibilityManager.ActionBackSignal().Connect(this,&TBTDaliAccessibilityManagerView::onActionBackSignal);
+       mAccessibilityManager.ActionScrollSignal().Connect(this,&TBTDaliAccessibilityManagerView::onActionScrollSignal);
+
+       mTableView=TableView::New(15,1);
+       mTableView.SetAnchorPoint(AnchorPoint::TOP_LEFT);
+       mTableView.SetParentOrigin(ParentOrigin::TOP_LEFT);
+       mTableView.SetSize(this->bodySize);
+       mTableView.SetPosition(0.0f, 0.0f);
+       this->ctlBody.Add(mTableView);
+
        Property::Map ctl;
        Property::Map size;
 
-       ctl["lbl1"]="  Action activate signal not call";
+       ctl["lbl1"]="  Focus changed signal not call";
+       ctl["lbl2"]="  Focus overshot signal not call";
+       ctl["lbl3"]="  Focused actor activated signal not call";
+       ctl["lbl4"]="  Accessibility Status changed signal not call";
+       ctl["lbl5"]=" Action scroll signal not call";
+//     ctl["lbl5"]="  Action over signal not call";
+//     ctl["lbl6"]="  Action up signal not call";
+//     ctl["lbl7"]="  Action down signal not call";
+//     ctl["lbl8"]="  Action clear focus signal not call";
+//     ctl["lbl9"]="  Action back signal not call";
+
+
 
        size["lbl1"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
-       CreateLabelList(ctl,size);
-
-       mAccessibilityManager.ActionActivateSignal().Connect(this,&TBTDaliAccessibilityManagerView::OnAccessibilityActionSignalType);
-       mAccessibilityManager.ActionNextSignal().Connect(this, &TBTDaliAccessibilityManagerView::OnActionNextSignal);
-
-       Vector2 buttonSize=Vector2(bodySize.width, BUTTON_HEIGHT*bodySize.height);
-
-       Vector2 posDown=Vector2(0.0f, bodySize.height - (buttonSize.height + VERTICAL_SPACE*bodySize.height));
-       btnDown=CreateButton(AnchorPoint::TOP_LEFT, posDown, "Down", selectedColor, unSelectedColor, buttonSize);
-       btnDown.ClickedSignal().Connect(this,&TBTDaliAccessibilityManagerView::OnClick);
-       mAccessibilityManager.SetFocusOrder( btnDown, 1 );
-       mAccessibilityManager.SetCurrentFocusActor( btnDown );
-       ctlBody.Add(btnDown);
-
-       Vector2 posUp=Vector2(0.0f, bodySize.height - (BUTTON_HEIGHT*bodySize.height + VERTICAL_SPACE*bodySize.height + buttonSize.height + VERTICAL_SPACE*bodySize.height));
-       btnUp=CreateButton(AnchorPoint::TOP_LEFT, posUp, "Up", selectedColor, unSelectedColor, buttonSize);
-       btnUp.ClickedSignal().Connect(this,&TBTDaliAccessibilityManagerView::OnClick);
-       mAccessibilityManager.SetFocusOrder( btnUp, 2 );
-       mAccessibilityManager.SetCurrentFocusActor( btnUp );
-       ctlBody.Add(btnUp);
-       mAccessibilityManager.SetCurrentFocusActor( btnUp );
+       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);
+       size["lbl5"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+//     size["lbl5"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+//     size["lbl6"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+//     size["lbl7"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+//     size["lbl8"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+//     size["lbl9"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+
+
+       //CreateLabelList(ctl,size);
+       AddLabelToTable(mTableView,ctl,size);
+
+       DBG("Count >>>>>> %d",ctlBody.GetChildCount());
+       int count=mTableView.GetChildCount();
+       DBG("TableView Child Count >>>>>> %d",count);
+
+       lblFocusChangedSignal=TextLabel::DownCast(mTableView.GetChildAt(0));
+       lblFocusOvershotSignal=TextLabel::DownCast(mTableView.GetChildAt(1));
+       lblFocusedActorActivatedSignal=TextLabel::DownCast(mTableView.GetChildAt(2));
+       lblStatusChangedSignal=TextLabel::DownCast(mTableView.GetChildAt(3));
+       lblActionScrollSignal=TextLabel::DownCast(mTableView.GetChildAt(4));
+//     lblActionOverSignal=TextLabel::DownCast(mTableView.GetChildAt(4));
+//     lblActionUpSignal=TextLabel::DownCast(mTableView.GetChildAt(5));
+//     lblActionDownSignal=TextLabel::DownCast(mTableView.GetChildAt(6));
+//     lblActionClearFocusSignal=TextLabel::DownCast(mTableView.GetChildAt(7));
+//     lblActionBackSignal=TextLabel::DownCast(mTableView.GetChildAt(8));
+
+
+       mTableView.AddChild(lblFocusChangedSignal, TableView::CellPosition(0,0));
+       mTableView.AddChild(lblFocusOvershotSignal, TableView::CellPosition(1,0));
+       mTableView.AddChild(lblFocusedActorActivatedSignal, TableView::CellPosition(2,0));
+       mTableView.AddChild(lblStatusChangedSignal, TableView::CellPosition(3,0));
+       mTableView.AddChild(lblActionScrollSignal, TableView::CellPosition(4,0));
+//     mTableView.AddChild(lblActionOverSignal, TableView::CellPosition(4,0));
+//     mTableView.AddChild(lblActionUpSignal, TableView::CellPosition(5,0));
+//     mTableView.AddChild(lblActionDownSignal, TableView::CellPosition(6,0));
+//     mTableView.AddChild(lblActionClearFocusSignal, TableView::CellPosition(7,0));
+//     mTableView.AddChild(lblActionBackSignal, TableView::CellPosition(8,0));
+
+
+       mAccessibilityManager.SetFocusOrder(lblFocusChangedSignal,1);
+       mAccessibilityManager.SetFocusOrder(lblFocusOvershotSignal,mAccessibilityManager.GenerateNewFocusOrder());
+       mAccessibilityManager.SetFocusOrder(lblFocusedActorActivatedSignal,mAccessibilityManager.GenerateNewFocusOrder());
+       mAccessibilityManager.SetFocusOrder(lblStatusChangedSignal,mAccessibilityManager.GenerateNewFocusOrder());
+       mAccessibilityManager.SetFocusOrder(lblActionScrollSignal,mAccessibilityManager.GenerateNewFocusOrder());
+//     mAccessibilityManager.SetFocusOrder(lblActionOverSignal,5);
+//     mAccessibilityManager.SetFocusOrder(lblActionUpSignal,6);
+//     mAccessibilityManager.SetFocusOrder(lblActionDownSignal,7);
+//     mAccessibilityManager.SetFocusOrder(lblActionClearFocusSignal,8);
+//     mAccessibilityManager.SetFocusOrder(lblActionBackSignal,9);
+
+
+       if(! mAccessibilityManager.SetCurrentFocusActor(lblFocusChangedSignal))
+               DBG("unable to set current focus actor");
+
+//     slider=Slider::New();
+//     slider.SetParentOrigin( ParentOrigin::TOP_LEFT );
+//     slider.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+//     slider.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
+//     slider.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
+//
+//     mTableView.AddChild(slider, TableView::CellPosition(11,0));
+//     mAccessibilityManager.SetFocusOrder(slider,mAccessibilityManager.GenerateNewFocusOrder());
+//
+//     Vector2 buttonSize=Vector2(bodySize.width, BUTTON_HEIGHT*bodySize.height);
+//     Vector2 pos=Vector2(0.0f, 0.0f);
+//
+//     btnClear=CreateButton(AnchorPoint::TOP_LEFT, pos, "Clear Focus", selectedColor, unSelectedColor, buttonSize);
+//     btnClear.ClickedSignal().Connect(this,&TBTDaliAccessibilityManagerView::OnClearClick);
+//     mAccessibilityManager.SetFocusOrder( btnClear, mAccessibilityManager.GenerateNewFocusOrder());
+//
+//     mTableView.AddChild(btnClear, TableView::CellPosition(13,0));
+}
+
+bool TBTDaliAccessibilityManagerView::OnClearClick(Button button)
+{
+       DBG("In TBTDaliAccessibilityManagerView::OnClearClick");
+       mAccessibilityManager.ClearFocus();
+       //mAccessibilityManager.Reset();
+       return true;
 }
 
-bool TBTDaliAccessibilityManagerView::OnClick(Button button)
+void TBTDaliAccessibilityManagerView::onFocusChangedSignal(Actor previous, Actor next)
 {
-       DBG("In TBTDaliAccessibilityManagerView::OnClick");
-       mAccessibilityManager.MoveFocusForward();
-       mAccessibilityManager.SetCurrentFocusActor(btnDown);
+       DBG("In TBTDaliAccessibilityManagerView::onFocusChangedSignal");
+       lblFocusChangedSignal.SetProperty(TextLabel::Property::TEXT,"   Focus Changed Signal called");
+       lblFocusChangedSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+}
+void TBTDaliAccessibilityManagerView::onFocusOvershotSignal(Actor actor, AccessibilityManager::FocusOvershotDirection director)
+{
+       DBG("In TBTDaliAccessibilityManagerView::onFocusOvershotSignal");
+       lblFocusOvershotSignal.SetProperty(TextLabel::Property::TEXT,"   Focus Overshot Signal called");
+       lblFocusOvershotSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+}
+void TBTDaliAccessibilityManagerView::onFocusedActorActivatedSignal(Actor actor)
+{
+       DBG("In TBTDaliAccessibilityManagerView::onFocusedActorActivatedSignal");
+       lblFocusedActorActivatedSignal.SetProperty(TextLabel::Property::TEXT,"   Focused Actor Activated Signal called");
+       lblFocusedActorActivatedSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+}
+bool TBTDaliAccessibilityManagerView::onStatusChangedSignal(AccessibilityManager& manager)
+{
+       DBG("In TBTDaliAccessibilityManagerView::onStatusChangedSignal");
+       lblStatusChangedSignal.SetProperty(TextLabel::Property::TEXT,"   Accessibility Status Changed Signal called");
+       lblStatusChangedSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
        return true;
 }
-bool TBTDaliAccessibilityManagerView::OnAccessibilityActionSignalType( AccessibilityManager& manager )
+bool TBTDaliAccessibilityManagerView::onActionOverSignal(AccessibilityManager& manager)
 {
-       DBG("In TBTDaliAccessibilityManagerView::OnAccessibilityActionSignalType");
-       Actor actor0=ctlBody.GetChildAt(0);
-       TextLabel lbl=TextLabel::DownCast(actor0);
-       lbl.SetProperty(TextLabel::Property::TEXT,"Action activate signal called");
-       lbl.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       DBG("In TBTDaliAccessibilityManagerView::onActionOverSignal");
+//     lblActionOverSignal.SetProperty(TextLabel::Property::TEXT,"   Action Over Signal called");
+//     lblActionOverSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
        return true;
 }
-bool TBTDaliAccessibilityManagerView::OnActionNextSignal(AccessibilityManager& manager)
+bool TBTDaliAccessibilityManagerView::onActionUpSignal(AccessibilityManager& manager)
 {
-       DBG("In TBTDaliAccessibilityManagerView::OnActionNextSignal");
+       DBG("In TBTDaliAccessibilityManagerView::onActionUpSignal");
+//     lblActionUpSignal.SetProperty(TextLabel::Property::TEXT,"   Action Up Signal called");
+//     lblActionUpSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
        return true;
 }
+bool TBTDaliAccessibilityManagerView::onActionDownSignal(AccessibilityManager& manager)
+{
+       DBG("In TBTDaliAccessibilityManagerView::onActionDownSignal");
+//     lblActionDownSignal.SetProperty(TextLabel::Property::TEXT,"   Action Down Signal called");
+//     lblActionDownSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       return true;
+}
+bool TBTDaliAccessibilityManagerView::onActionClearFocusSignal(AccessibilityManager& manager)
+{
+       DBG("In TBTDaliAccessibilityManagerView::onActionClearFocusSignal");
+//     lblActionClearFocusSignal.SetProperty(TextLabel::Property::TEXT,"   Action Clear Focus Signal called");
+//     lblActionClearFocusSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       return true;
+}
+bool TBTDaliAccessibilityManagerView::onActionBackSignal(AccessibilityManager& manager)
+{
+       DBG("In TBTDaliAccessibilityManagerView::onActionBackSignal");
+//     lblActionBackSignal.SetProperty(TextLabel::Property::TEXT,"   Action Back Signal called");
+//     lblActionBackSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       return true;
+}
+bool TBTDaliAccessibilityManagerView::onActionScrollSignal(AccessibilityManager& manager, const Dali::TouchEvent& event)
+{
+       DBG("In TBTDaliAccessibilityManagerView::onActionScrollSignal");
+       lblActionScrollSignal.SetProperty(TextLabel::Property::TEXT,"   Action Scroll Signal called");
+       lblActionScrollSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+       return true;
+}
+
index 3edbd80b1b2177b59eec338a8a4cf4d477f1eb18..750d40b1b4288046dc4d158d783c74cf6abaeff5 100644 (file)
@@ -33,14 +33,29 @@ TBTDaliKeyBoardFocusManagerView::TBTDaliKeyBoardFocusManagerView(Application& mA
                        "\nTo perform the test:"
                        "\n1.   Run DALi Keyboard Focus Manager."
                        "\n2.   Connect keyboard with target using OTG cable."
-                       "\n3.   Press Up/Down button to change the focus of control "
-                       "\n4.   Change the text control text (text field & text editor)."
-                       "\n5.   If the corresponding event signals"
+                       "\n3.   Press Up/Down key on keyboard to change the focus of control to test PreFocusChangeSignal"
+                       "\n4.   Press enter key on keyboard to test FocusedActorEnterKeySignal"
+                       "\n5.   Press tab key on keyboard to test FocusGroupChangedSignal"
+                       "\n6.   If the corresponding event signals"
                        " mgs are changed then press <color value='green'><b>Pass</b></color>."
                        " Otherwise, press <color value='red'><b>Fail</b></color>";
 
        Stage stage = Stage::GetCurrent();
        mFocusManager = KeyboardFocusManager::Get();
+//
+       mTableView=TableView::New(10,1);
+       mTableView.SetAnchorPoint(AnchorPoint::TOP_LEFT);
+       mTableView.SetParentOrigin(ParentOrigin::TOP_LEFT);
+       mTableView.SetSize(this->bodySize);
+       mTableView.SetPosition(0.0f, 0.0f);
+       mTableView.SetKeyboardFocusable(true);
+       this->ctlBody.Add(mTableView);
+
+       mFocusManager.PreFocusChangeSignal().Connect( this, &TBTDaliKeyBoardFocusManagerView::OnPreFocusChange );
+       mFocusManager.FocusChangedSignal().Connect( this, &TBTDaliKeyBoardFocusManagerView::OnFocusChanged );
+       mFocusManager.FocusGroupChangedSignal().Connect( this, &TBTDaliKeyBoardFocusManagerView::OnFocusGroupChanged );
+       mFocusManager.FocusedActorEnterKeySignal().Connect( this, &TBTDaliKeyBoardFocusManagerView::OnFocusedActorEnterKey );
+       mFocusManager.SetAsFocusGroup(mTableView,true);
 
        Property::Map ctl;
        Property::Map size;
@@ -55,86 +70,61 @@ TBTDaliKeyBoardFocusManagerView::TBTDaliKeyBoardFocusManagerView(Application& mA
        size["lbl3"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
        size["lbl4"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
 
-       CreateLabelList(ctl,size);
+       AddLabelToTable(mTableView,ctl,size);
 
        DBG("Count >>>>>> %d",ctlBody.GetChildCount());
+       int count=mTableView.GetChildCount();
+       DBG("TableView Child Count >>>>>> %d",count);
 
-       lblPreFocus=TextLabel::DownCast(ctlBody.GetChildAt(0));
-       lblFocusChange=TextLabel::DownCast(ctlBody.GetChildAt(1));
-       lblFocusGroup=TextLabel::DownCast(ctlBody.GetChildAt(2));
-       lblFocusActor=TextLabel::DownCast(ctlBody.GetChildAt(3));
-
-       //button
-       Vector2 buttonSize=Vector2(bodySize.width, BUTTON_HEIGHT*bodySize.height);
-
-       Vector2 posDown=Vector2(0.0f, bodySize.height - (buttonSize.height + VERTICAL_SPACE*bodySize.height));
-       btnDown=CreateButton(AnchorPoint::TOP_LEFT, posDown, "Down", selectedColor, unSelectedColor, buttonSize);
-       btnDown.ClickedSignal().Connect(this,&TBTDaliKeyBoardFocusManagerView::OnDownClick);
-       ctlBody.Add(btnDown);
-
-       Vector2 posUp=Vector2(0.0f, bodySize.height - (BUTTON_HEIGHT*bodySize.height + VERTICAL_SPACE*bodySize.height + buttonSize.height + VERTICAL_SPACE*bodySize.height));
-       btnUp=CreateButton(AnchorPoint::TOP_LEFT, posUp, "Up", selectedColor, unSelectedColor, buttonSize);
-       btnUp.ClickedSignal().Connect(this,&TBTDaliKeyBoardFocusManagerView::OnUpClick);
-       ctlBody.Add(btnUp);
-
-       Vector2 textEditorSize=Vector2(0.7f*bodySize.width, 2.0f*TEXTEDITOR_HEIGHT*bodySize.height);
-
-       Vector2 posEditor=Vector2(0.3f*bodySize.width/2, bodySize.height - (BUTTON_HEIGHT*bodySize.height + VERTICAL_SPACE*bodySize.height + buttonSize.height + VERTICAL_SPACE*bodySize.height+ VERTICAL_SPACE*bodySize.height + textEditorSize.height));
-
-       Control ctlEditor=CreateTextEditor(AnchorPoint::TOP_LEFT,ParentOrigin::TOP_LEFT,posEditor,"",textEditorSize);
-       ctlBody.Add(ctlEditor);
-
-       txt_editor=TextEditor::DownCast(ctlEditor.GetChildAt(0));
-       txt_editor.TextChangedSignal().Connect(this,&TBTDaliKeyBoardFocusManagerView::onTextChanged);
-       PushButton button=PushButton::DownCast(ctlEditor.GetChildAt(1));
-       button.ClickedSignal().Connect(this, &TBTDaliKeyBoardFocusManagerView::OnButtonClick);
-
-       Vector2 textFieldSize=Vector2(0.7f*bodySize.width, TEXTFIELD_HEIGHT*bodySize.height);
-       Vector2 pos=Vector2(0.3f*bodySize.width/2, bodySize.height - (BUTTON_HEIGHT*bodySize.height + VERTICAL_SPACE*bodySize.height + buttonSize.height + VERTICAL_SPACE*bodySize.height+ VERTICAL_SPACE*bodySize.height + textEditorSize.height + 2*VERTICAL_SPACE*bodySize.height + textFieldSize.height));
-       Control txtField=CreateTextField(AnchorPoint::TOP_LEFT,ParentOrigin::TOP_LEFT,pos,"",textFieldSize);
-       ctlBody.Add(txtField);
-
-       txt_field=TextField::DownCast(txtField.GetChildAt(0));
-       PushButton button1=PushButton::DownCast(txtField.GetChildAt(1));
-       button1.ClickedSignal().Connect(this, &TBTDaliKeyBoardFocusManagerView::OnButtonClick_1);
-
+       lblPreFocus=TextLabel::DownCast(mTableView.GetChildAt(0));
+       lblFocusChange=TextLabel::DownCast(mTableView.GetChildAt(1));
+       lblFocusGroup=TextLabel::DownCast(mTableView.GetChildAt(2));
+       lblFocusActor=TextLabel::DownCast(mTableView.GetChildAt(3));
 
        lblPreFocus.SetKeyboardFocusable(true);
        lblFocusChange.SetKeyboardFocusable(true);
        lblFocusGroup.SetKeyboardFocusable(true);
        lblFocusActor.SetKeyboardFocusable(true);
 
-       txt_editor.SetKeyboardFocusable(true);
-       txt_field.SetKeyboardFocusable(true);
-       btnUp.SetKeyboardFocusable(true);
-       btnDown.SetKeyboardFocusable(true);
-
-       mFocusManager.SetAsFocusGroup(ctlBody,true);
+       Vector2 textFieldSize=Vector2(0.7f*bodySize.width, TEXTFIELD_HEIGHT*bodySize.height);
+       Vector2 pos=Vector2(0.0f, 0.0f);
 
-       mFocusManager.PreFocusChangeSignal().Connect( this, &TBTDaliKeyBoardFocusManagerView::OnPreFocusChange );
-       mFocusManager.FocusChangedSignal().Connect( this, &TBTDaliKeyBoardFocusManagerView::OnFocusChanged );
-       mFocusManager.FocusGroupChangedSignal().Connect( this, &TBTDaliKeyBoardFocusManagerView::OnFocusGroupChanged );
-       mFocusManager.FocusedActorEnterKeySignal().Connect( this, &TBTDaliKeyBoardFocusManagerView::OnFocusedActorEnterKey );
-}
-bool TBTDaliKeyBoardFocusManagerView::OnButtonClick(Button button)
-{
-       DBG("TBTDaliKeyBoardFocusManagerView::OnButtonClick");
-       txt_editor.SetProperty(TextEditor::Property::TEXT,"");
-       return true;
+       Control txtField=CreateTextField(AnchorPoint::TOP_LEFT,ParentOrigin::TOP_LEFT,pos,"",textFieldSize);
+       txt_field1=TextField::DownCast(txtField.GetChildAt(0));
+       txtField.SetKeyboardFocusable(true);
+       mTableView.AddChild(txtField,TableView::CellPosition(count,0));
+       mFocusManager.SetCurrentFocusActor(txtField);
+       PushButton::DownCast(txtField.GetChildAt(1)).ClickedSignal().Connect(this, &TBTDaliKeyBoardFocusManagerView::OnButtonClick_1);
+
+
+       Control txtField1=CreateTextField(AnchorPoint::TOP_LEFT,ParentOrigin::TOP_LEFT,pos,"",textFieldSize);
+       txt_field2=TextField::DownCast(txtField1.GetChildAt(0));
+       txtField1.SetKeyboardFocusable(true);
+       mTableView.AddChild(txtField1,TableView::CellPosition(count+1,0));
+       PushButton::DownCast(txtField1.GetChildAt(1)).ClickedSignal().Connect(this, &TBTDaliKeyBoardFocusManagerView::OnButtonClick_2);
+
+       Control txtField2=CreateTextField(AnchorPoint::TOP_LEFT,ParentOrigin::TOP_LEFT,pos,"",textFieldSize);
+       txt_field3=TextField::DownCast(txtField2.GetChildAt(0));
+       txtField2.SetKeyboardFocusable(true);
+       mTableView.AddChild(txtField2,TableView::CellPosition(count+2,0));
+       PushButton::DownCast(txtField2.GetChildAt(1)).ClickedSignal().Connect(this, &TBTDaliKeyBoardFocusManagerView::OnButtonClick_3);
 }
 bool TBTDaliKeyBoardFocusManagerView::OnButtonClick_1(Button button)
 {
        DBG("TBTDaliKeyBoardFocusManagerView::OnButtonClick_1");
-       txt_field.SetProperty(TextEditor::Property::TEXT,"");
+       txt_field1.SetProperty(TextEditor::Property::TEXT,"");
        return true;
 }
-void TBTDaliKeyBoardFocusManagerView::onTextChanged(TextEditor editor)
+bool TBTDaliKeyBoardFocusManagerView::OnButtonClick_2(Button button)
 {
-       DBG("TBTDaliKeyBoardFocusManagerView::onTextChanged");
+       DBG("TBTDaliKeyBoardFocusManagerView::OnButtonClick_2");
+       txt_field2.SetProperty(TextEditor::Property::TEXT,"");
+       return true;
 }
-bool TBTDaliKeyBoardFocusManagerView::onKeyEventSignal(Control control, const KeyEvent& event)
+bool TBTDaliKeyBoardFocusManagerView::OnButtonClick_3(Button button)
 {
-       DBG("TBTDaliKeyBoardFocusManagerView::onKeyEventSignal");
+       DBG("TBTDaliKeyBoardFocusManagerView::OnButtonClick_3");
+       txt_field3.SetProperty(TextEditor::Property::TEXT,"");
        return true;
 }
 
@@ -143,7 +133,11 @@ Actor TBTDaliKeyBoardFocusManagerView::OnPreFocusChange(Actor current, Actor pro
        DBG("In TBTDaliKeyBoardFocusManagerView::OnPreFocusChange");
 
        if(!current | !proposed)
+       {
                DBG("current and proposed actor NULL");
+               Actor actor=mTableView.GetChildAt(4);
+               mFocusManager.SetCurrentFocusActor(actor);
+       }
        else
                DBG("Current Actor: %s  Proposed Actor: %s",current.GetName().c_str(),proposed.GetName().c_str());
 
@@ -178,23 +172,4 @@ void TBTDaliKeyBoardFocusManagerView::OnFocusedActorEnterKey(Actor actor)
        lblFocusActor.SetProperty(TextLabel::Property::TEXT,"Focus actor key signal called");
        lblFocusActor.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
 }
-bool TBTDaliKeyBoardFocusManagerView::OnUpClick(Button button)
-{
-       DBG("In TBTDaliKeyBoardFocusManagerView::OnUpClick");
-       //mFocusManager.MoveFocus(Control::KeyboardFocus::UP);
-       //mFocusManager.SetFocusIndicatorActor(txt_field);
-       mFocusManager.SetCurrentFocusActor(txt_field);
-       //txt1.SetKeyInputFocus();
-       //mFocusManager.SetCurrentFocusActor(mrootTable);
-       return true;
-}
-bool TBTDaliKeyBoardFocusManagerView::OnDownClick(Button button)
-{
-       DBG("In TBTDaliKeyBoardFocusManagerView::OnDownClick");
-       //mFocusManager.MoveFocus(Control::KeyboardFocus::DOWN);
-       mFocusManager.SetCurrentFocusActor(txt_editor);
-       //txt2.SetKeyInputFocus();
-       //mFocusManager.SetFocusIndicatorActor(txt2);
-       return true;
-}
 
index 0cd9208f31759e14603a1b9a643f3aa2e1fcd986..238bbef37a203ed99159451d23c87134a411e1ec 100644 (file)
@@ -32,7 +32,7 @@ TBTDaliLongPressGestureDoubleView::TBTDaliLongPressGestureDoubleView(Application
        mInfoText=std::string("")+
                        "\nTo perform the test:"
                        "\n1.   Run DALi Long Press Gesture Double Touch."
-                       "\n2.   Perform the long press gesture with double touch"
+                       "\n2.   Perform the two finger long press on screen then corresponding signal and data will display"
                        "\n3.   If the corresponding event signals mgs and touch data"
                        " are changed then press <color value='green'><b>Pass</b></color>. "
                        "Otherwise, press <color value='red'><b>Fail</b></color>";
index 72c391e558cca57356c4bb1ad0547a0bae915332..adc8b99a9d59c7eeee36a7feedd956b8c647c223 100644 (file)
@@ -32,7 +32,7 @@ TBTDaliLongPressGestureMultipleView::TBTDaliLongPressGestureMultipleView(Applica
        mInfoText=std::string("")+
                        "\nTo perform the test:"
                        "\n1.   Run DALi Long Press Gesture Multiple Touches."
-                       "\n2.   Perform the long press gesture with multiple fingers"
+                       "\n2.   Perform the one/two/three finger long press on screen then corresponding signal and data will display"
                        "\n3.   If the corresponding event signals mgs and touch data"
                        " are changed then press <color value='green'><b>Pass</b></color>. "
                        "Otherwise, press <color value='red'><b>Fail</b></color>";
index 31e3bc8d13f7b8a630e9df00d563d8529570e3b7..8cc15c3f9ea8e109a8c8fb9f04b85e093f15f011 100644 (file)
@@ -31,8 +31,8 @@ TBTDaliLongPressGestureSingleView::TBTDaliLongPressGestureSingleView(Application
        Init("Long Press Gesture Single Touch");//initialize the common view
        mInfoText=std::string("")+
                        "\nTo perform the test:"
-                       "\n1.   Run DALi Long Press Gesture Single Touch."
-                       "\n2.   Perform the long press gesture with single touch"
+                       "\n1.   Run DALi Long Press Gesture Single."
+                       "\n2.   Perform the one finger long press on screen then corresponding signal and data will display"
                        "\n3.   If the corresponding event signals mgs and touch data"
                        " are changed then press <color value='green'><b>Pass</b></color>. "
                        "Otherwise, press <color value='red'><b>Fail</b></color>";
index e20f2fadf7ce941106f860721dc06ac48dec736a..5dc9827c8858c46cdfc99a4898a25a45f836415c 100644 (file)
@@ -32,7 +32,7 @@ TBTDaliPanGestureAngleDirectionView::TBTDaliPanGestureAngleDirectionView(Applica
        mInfoText=std::string("")+
                        "\nTo perform the test:"
                        "\n1.   Run DALi Pan Gesture Angle and Direction."
-                       "\n2.   Perform the pan gesture with right diagonal"
+                       "\n2.   Perform the one finger pan on screen with right diagonal up then corresponding signal and data will display"
                        "\n3.   Add/Remove angle and direction of pan gesture"
                        "\n4.   If the corresponding event signals mgs and touch data"
                        " are changed then press <color value='green'><b>Pass</b></color>. "
index ec089d1aac070d56d6816e4d792e0d18422326bf..7b989927d3646e7122decd82c59107d5a11f670d 100644 (file)
@@ -32,7 +32,7 @@ TBTDaliPanGestureDoubleView::TBTDaliPanGestureDoubleView(Application& mApplicati
        mInfoText=std::string("")+
                        "\nTo perform the test:"
                        "\n1.   Run DALi Pan Gesture Double Touch."
-                       "\n2.   Perform the pan gesture with double touch"
+                       "\n2.   Perform the two fingers pan on screen then corresponding signal and data will display"
                        "\n3.   If the corresponding event signals mgs and touch data"
                        " are changed then press <color value='green'><b>Pass</b></color>. "
                        "Otherwise, press <color value='red'><b>Fail</b></color>";
index b53cef18114e5a2ab041db9049a88b2def90348b..3254eea898a1d25b441fafab4a21e52cc625fdc9 100644 (file)
@@ -32,7 +32,7 @@ TBTDaliPanGestureSingleView::TBTDaliPanGestureSingleView(Application& mApplicati
        mInfoText=std::string("")+
                        "\nTo perform the test:"
                        "\n1.   Run DALi Pan Gesture Single Touch."
-                       "\n2.   Perform the pan gesture with single touch"
+                       "\n2.   Perform the one finger pan on screen then corresponding signal and data will display."
                        "\n3.   If the corresponding event signals mgs and touch data"
                        " are changed then press <color value='green'><b>Pass</b></color>. "
                        "Otherwise, press <color value='red'><b>Fail</b></color>";
index 030265c0b6f658827788cf18287b4e03964dae94..bb33c7edda1d42aef9e37399ec7f676c5a99c00a 100644 (file)
@@ -32,7 +32,7 @@ TBTDaliPinchGestureSingleView::TBTDaliPinchGestureSingleView(Application& mAppli
        mInfoText=std::string("")+
                        "\nTo perform the test:"
                        "\n1.   Run DALi Pinch Gesture."
-                       "\n2.   Perform the pinch gesture"
+                       "\n2.   Perform the pinch gesture on screen then corresponding signal will call"
                        "\n3.   If the corresponding event signals mgs and touch data"
                        " are changed then press <color value='green'><b>Pass</b></color>. "
                        "Otherwise, press <color value='red'><b>Fail</b></color>";
index 0b16e1a14c451eae13c8a4463bcf0db1d32a86bf..c69f982303582076f3206309e87a883e49793882 100644 (file)
@@ -41,52 +41,54 @@ TBTDaliStageView::TBTDaliStageView(Application& mApplication, app_control_h _con
                        "4.     Enter text in text field.\n"
                        "5.     If the corresponding event signal and data mgs"
                        "are changed then press <color value='green'><b>Pass</b></color>."
-                       " Otherwise, press <color value='red'><b>Fail</b></color>.\n";
+                       " Otherwise, press <color value='red'><b>Fail</b></color>.\n"
+                       "Note: Wheel event signal only for wearable device detent rotation."
+                       "Detent event is received for rotate the wheel of watch device.";
 
        Stage stage = Stage::GetCurrent();
        Vector2 stageSize = stage.GetSize();
 
        Property::Map ctl;
-       ctl["lbl1"]="Context lost signal not call";
-       ctl["lbl2"]="Context regain signal not call";
-       ctl["lbl3"]="Event Processing signal not call";
-       ctl["lbl4"]="Key Event signal not call";
-       ctl["lbl5"]="Scene created signal not call";
-       ctl["lbl6"]="Touched signal not call";
-       ctl["lbl7"]="Touch signal not call";
-       ctl["lbl8"]="Wheel event signal not call";
+       //ctl["lbl1"]="   Context lost signal not call";
+       //ctl["lbl2"]="   Context regain signal not call";
+       ctl["lbl1"]="   Event Processing signal not call";
+       ctl["lbl2"]="   Key Event signal not call";
+       ctl["lbl3"]="   Scene created signal not call";
+       ctl["lbl4"]="   Touched signal not call";
+       ctl["lbl5"]="   Touch signal not call";
+       ctl["lbl6"]="   Wheel event signal not call";
 
        Property::Map size;
+       //size["lbl1"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
+       //size["lbl2"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
        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);
        size["lbl5"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
        size["lbl6"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
-       size["lbl7"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
-       size["lbl8"]=Vector2(bodySize.width, TEXTLABEL_HEIGHT * bodySize.height);
 
        CreateLabelList(ctl,size);//create textlabel list
 
-       txtContext=TextLabel::DownCast(ctlBody.GetChildAt(0));
-       txtContextRegain=TextLabel::DownCast(ctlBody.GetChildAt(1));
-       txtEventProcessing=TextLabel::DownCast(ctlBody.GetChildAt(2));
-       txtKeyEvent=TextLabel::DownCast(ctlBody.GetChildAt(3));
-       txtSceneCreated=TextLabel::DownCast(ctlBody.GetChildAt(4));
-       txtTouched=TextLabel::DownCast(ctlBody.GetChildAt(5));
-       txtTouch=TextLabel::DownCast(ctlBody.GetChildAt(6));
-       txtWheel=TextLabel::DownCast(ctlBody.GetChildAt(7));
+       //txtContext=TextLabel::DownCast(ctlBody.GetChildAt(0));
+       //txtContextRegain=TextLabel::DownCast(ctlBody.GetChildAt(1));
+       txtEventProcessing=TextLabel::DownCast(ctlBody.GetChildAt(0));
+       txtKeyEvent=TextLabel::DownCast(ctlBody.GetChildAt(1));
+       txtSceneCreated=TextLabel::DownCast(ctlBody.GetChildAt(2));
+       txtTouched=TextLabel::DownCast(ctlBody.GetChildAt(3));
+       txtTouch=TextLabel::DownCast(ctlBody.GetChildAt(4));
+       txtWheel=TextLabel::DownCast(ctlBody.GetChildAt(5));
 
        Vector2 buttonSize=Vector2(bodySize.width, 2.0f*BUTTON_HEIGHT*bodySize.height);
        Vector2 position=Vector2(0.0f, bodySize.height - (buttonSize.height + VERTICAL_SPACE*bodySize.height));
-       btnTestButton=CreateButton(AnchorPoint::TOP_LEFT, position, "Test mouse wheel here", selectedColor, unSelectedColor, buttonSize);
-       //btnTestButton.WheelEventSignal().Connect(this,&TBTDaliStageView::onWheelEvent);
-       btnTestButton.ClickedSignal().Connect(this,&TBTDaliStageView::OnButtonClicked);
-       ctlBody.Add(btnTestButton);
+//     btnTestButton=CreateButton(AnchorPoint::TOP_LEFT, position, "Test mouse wheel here", selectedColor, unSelectedColor, buttonSize);
+//     //btnTestButton.WheelEventSignal().Connect(this,&TBTDaliStageView::onWheelEvent);
+//     btnTestButton.ClickedSignal().Connect(this,&TBTDaliStageView::OnButtonClicked);
+//     ctlBody.Add(btnTestButton);
 
        if(msg=="onSceneCreated")
        {
-               txtSceneCreated.SetProperty(TextLabel::Property::TEXT,"  Scene created event is called");
+               txtSceneCreated.SetProperty(TextLabel::Property::TEXT,"    Scene created event is called");
                txtSceneCreated.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
        }
 
@@ -99,8 +101,19 @@ TBTDaliStageView::TBTDaliStageView(Application& mApplication, app_control_h _con
 
        txt=TextField::DownCast(txtField.GetChildAt(0));
 
-       stage.ContextLostSignal().Connect(this,&TBTDaliStageView::onContextLost);
-       stage.ContextRegainedSignal().Connect(this,&TBTDaliStageView::onContextRegain);
+
+       /* Reason for remove ContextLostSignal  ContextRegainedSignal
+        *  The original patch was for supporting an Android implementation, and was ported to Tizen. Android suffers from a specific problem of having the GL context removed without any warning, releasing any textures uploaded to GL. The ReplaceSurface code is the main point where context regain occurred. In this older version of dali-core, we could automatically re-load textures following the context loss, hence the reason for informing Core/Stage classes. The flicker bug occurs because ReplaceSurface is also called  following screen rotation in Tizen, hence the second patch was a reasonable bug fix for Tizen.
+        *      We currently don’t support an Android implementation, however, if we do want to support it in the future, or any other platform where the GL context can be removed without warning, the public signals Stage::ContextLostSignal / ContextRegainedSignal will again be useful.
+
+        *  In the latest codebase, dali-core is no longer the only place where resource loading happens, so automatic re-upload of textures  or other GL resources is no longer possible. Core::RecoverFromContextLoss() method should be removed. We should also consider removing the application configuration from the public API, as it is no longer useful – the application will have to deal with context loss if it happens (unless we refactor the resource loading to be in one place again).
+        *      Regards,
+        *        David.
+        */
+
+       //stage.ContextLostSignal().Connect(this,&TBTDaliStageView::onContextLost);
+       //stage.ContextRegainedSignal().Connect(this,&TBTDaliStageView::onContextRegain);
+
        stage.EventProcessingFinishedSignal().Connect(this,&TBTDaliStageView::onEventProcessing);
        stage.KeyEventSignal().Connect(this,&TBTDaliStageView::onKeyEvent);
        //mStage.SceneCreatedSignal().Connect(this,&TBTDaliStageView::onSceneCreated);
@@ -197,57 +210,57 @@ void TBTDaliStageView::onKeyEvent(const KeyEvent& keyevent)
        if(shift)
                DBG("Press shift Modifier");
 
-       txtKeyEvent.SetProperty(TextLabel::Property::TEXT,"  Key event is called");
+       txtKeyEvent.SetProperty(TextLabel::Property::TEXT,"    Key event is called");
        txtKeyEvent.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
 }
 void TBTDaliStageView::onEventProcessing()
 {
        DBG("In TBTDaliStageView::onEventProcessing");
-       txtEventProcessing.SetProperty(TextLabel::Property::TEXT,"  Event processing signal is called");
+       txtEventProcessing.SetProperty(TextLabel::Property::TEXT,"    Event processing signal is called");
        txtEventProcessing.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
 }
 void TBTDaliStageView::onTouchedEvent(const TouchEvent& touchevent)
 {
        DBG("In TBTDaliStageView::onTaouchedEvent");
-       txtTouched.SetProperty(TextLabel::Property::TEXT,"  Touched event is called");
+       txtTouched.SetProperty(TextLabel::Property::TEXT,"    Touched event is called");
        txtTouched.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
 }
 void TBTDaliStageView::onTouchEvent(const TouchData& touchdata)
 {
        DBG("In TBTDaliStageView::onTouchEvrnt");
-       txtTouch.SetProperty(TextLabel::Property::TEXT,"  Touch event is called");
+       txtTouch.SetProperty(TextLabel::Property::TEXT,"    Touch event is called");
        txtTouch.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
 }
 bool TBTDaliStageView::onWheelEvent(Actor actor, const WheelEvent& wheelevent)
 {
        DBG("In TBTDaliStageView::onWheelEvent");
-       txtWheel.SetProperty(TextLabel::Property::TEXT,"  Wheel event is called");
+       txtWheel.SetProperty(TextLabel::Property::TEXT,"    Wheel event is called");
        txtWheel.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
        return true;
 }
 void TBTDaliStageView::onStageWheelEvent( const WheelEvent& wheelevent)
 {
        DBG("In TBTDaliStageView::onStageWheelEvent");
-       txtWheel.SetProperty(TextLabel::Property::TEXT,"  Wheel event is called");
+       txtWheel.SetProperty(TextLabel::Property::TEXT,"    Wheel event is called");
        txtWheel.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
 }
 
-void TBTDaliStageView::onContextLost()
-{
-       DBG("In TBTDaliStageView::cbContextLost");
-       txtContext.SetProperty(TextLabel::Property::TEXT,"  Context lost event is called");
-       txtContext.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
-}
-void TBTDaliStageView::onContextRegain()
-{
-       DBG("In TBTDaliStageView::onContextRegain");
-       txtContextRegain.SetProperty(TextLabel::Property::TEXT,"  Context regain event is called");
-       txtContextRegain.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
-}
+//void TBTDaliStageView::onContextLost()
+//{
+//     DBG("In TBTDaliStageView::cbContextLost");
+//     txtContext.SetProperty(TextLabel::Property::TEXT,"    Context lost event is called");
+//     txtContext.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+//}
+//void TBTDaliStageView::onContextRegain()
+//{
+//     DBG("In TBTDaliStageView::onContextRegain");
+//     txtContextRegain.SetProperty(TextLabel::Property::TEXT,"    Context regain event is called");
+//     txtContextRegain.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
+//}
 void TBTDaliStageView::onSceneCreated()
 {
        DBG("In TBTDaliStageView::onSceneCreated");
-       txtSceneCreated.SetProperty(TextLabel::Property::TEXT,"  Scene created event is called");
+       txtSceneCreated.SetProperty(TextLabel::Property::TEXT,"    Scene created event is called");
        txtSceneCreated.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
 }
 bool TBTDaliStageView::OnButtonClicked(Button button) {
index 0824c3e3f4afa1b09aeda1085da8baa4e4492c6b..eb9f97fd95187fafa82d93f676a492bc455abf69 100644 (file)
@@ -32,7 +32,7 @@ TBTDaliTapGestureMultipleView::TBTDaliTapGestureMultipleView(Application& mAppli
        mInfoText=std::string("")+
                        "\nTo perform the test:"
                        "\n1.   Run DALi Tap Press Gesture Multiple."
-                       "\n2.   Perform the tap gesture with multiple tap"
+                       "\n2.   Perform the one finger double tap on screen then corresponding signal and data will display"
                        "\n3.   If the corresponding event signals mgs and touch data"
                        " are changed then press <color value='green'><b>Pass</b></color>. "
                        "Otherwise, press <color value='red'><b>Fail</b></color>";
index 67765229a75a9f194ce6ed14e2d6fea9c7507df8..5523780fb9a32b8e4125e0603bc67ce392db3785 100644 (file)
@@ -32,7 +32,7 @@ TBTDaliTapGestureSingleView::TBTDaliTapGestureSingleView(Application& mApplicati
        mInfoText=std::string("")+
                        "\nTo perform the test:"
                        "\n1.   Run DALi Tap Press Gesture Single."
-                       "\n2.   Perform the tap gesture with single tap"
+                       "\n2.   Perform the one finger single tap on screen then corresponding signal and data will display"
                        "\n3.   If the corresponding event signals mgs and touch data"
                        " are changed then press <color value='green'><b>Pass</b></color>. "
                        "Otherwise, press <color value='red'><b>Fail</b></color>";
index d1769aa099ca09430b076726534d2afdb14628a2..dbd2383608874d3d1f9229b9e198efad0e06a7fe 100644 (file)
@@ -271,6 +271,12 @@ typedef enum {
 
        TBT_APP_DALI_ACCESSIBILITY_MANAGER,
 
+       TBT_APP_DALI_ACCESSIBILITY_MANAGER_FLICK,
+
+       TBT_APP_DALI_ACCESSIBILITY_MANAGER_TAP,
+
+       TBT_APP_DALI_ACCESSIBILITY_MANAGER_SWIPE,
+
        TBT_APP_DALI_LONG_PRESS_GESTURE_SINGLE,
 
        TBT_APP_DALI_LONG_PRESS_GESTURE_DOUBLE,
index c8dcb697acdfec816b06536c5c9d571f64b60fe7..35530265505145b7ffdc1432d5e2d1299d01678b 100644 (file)
 #define TBT_MODULE_APP_DALI_TEXT_CONTROL
 #define TBT_MODULE_APP_DALI_KEY_BOARD_FOCUS_MANAGER
 #define TBT_MODULE_APP_DALI_ACCESSIBILITY_MANAGER
+#define TBT_MODULE_APP_DALI_ACCESSIBILITY_MANAGER_FLICK
+#define TBT_MODULE_APP_DALI_ACCESSIBILITY_MANAGER_TAP
+//#define TBT_MODULE_APP_DALI_ACCESSIBILITY_MANAGER_SWIPE
 #define TBT_MODULE_APP_DALI_LONG_PRESS_GESTURE_SINGLE
 #define TBT_MODULE_APP_DALI_LONG_PRESS_GESTURE_DOUBLE
 #define TBT_MODULE_APP_DALI_LONG_PRESS_GESTURE_MULTIPLE
index 05f91f5476a0a387ff3f41d8307d35f135b1e1ad..3b44d2804ee170b1da6ae70ff33f327eeb1a41fe 100644 (file)
@@ -2541,6 +2541,42 @@ static tbt_info tbtapps[] =
                        .result = 0
                },
        #endif
+#ifdef TBT_MODULE_APP_DALI_ACCESSIBILITY_MANAGER_FLICK
+
+               //DALi Test
+               {
+                       .name = "DALi Accessibility Manager Flick",
+                       .parent = "DALi",
+                       .apptype = TBT_APP_DALI_ACCESSIBILITY_MANAGER_FLICK,
+                       .icon_name = "dummy",
+                       .info = "DALi Accessibility Manager Signals",
+                       .result = 0
+               },
+       #endif
+       #ifdef TBT_MODULE_APP_DALI_ACCESSIBILITY_MANAGER_TAP
+
+               //DALi Test
+               {
+                       .name = "DALi Accessibility Manager Tap",
+                       .parent = "DALi",
+                       .apptype = TBT_APP_DALI_ACCESSIBILITY_MANAGER_TAP,
+                       .icon_name = "dummy",
+                       .info = "DALi Accessibility Manager Signals",
+                       .result = 0
+               },
+       #endif
+       #ifdef TBT_MODULE_APP_DALI_ACCESSIBILITY_MANAGER_SWIPE
+
+               //DALi Test
+               {
+                       .name = "DALi Accessibility Manager Swipe",
+                       .parent = "DALi",
+                       .apptype = TBT_APP_DALI_ACCESSIBILITY_MANAGER_SWIPE,
+                       .icon_name = "dummy",
+                       .info = "DALi Accessibility Manager Signals",
+                       .result = 0
+               },
+       #endif
        #ifdef TBT_MODULE_APP_DALI_LONG_PRESS_GESTURE_SINGLE
 
                //DALi Test
index 6409c676982829e9843685c4970d1ee51380614e..352960677bb5d1092451f64ab1d030aa1755839c 100644 (file)
@@ -1182,6 +1182,15 @@ static void _gl_item_selected_cb(void *data, Evas_Object *obj EINA_UNUSED, void
                        case TBT_APP_DALI_ACCESSIBILITY_MANAGER:
                                dali_view_add(view->navi, info, it, "TBT_APP_DALI_ACCESSIBILITY_MANAGER");
                        break;
+                       case TBT_APP_DALI_ACCESSIBILITY_MANAGER_FLICK:
+                               dali_view_add(view->navi, info, it, "TBT_APP_DALI_ACCESSIBILITY_MANAGER_FLICK");
+                       break;
+                       case TBT_APP_DALI_ACCESSIBILITY_MANAGER_TAP:
+                               dali_view_add(view->navi, info, it, "TBT_APP_DALI_ACCESSIBILITY_MANAGER_TAP");
+                       break;
+                       case TBT_APP_DALI_ACCESSIBILITY_MANAGER_SWIPE:
+                               dali_view_add(view->navi, info, it, "TBT_APP_DALI_ACCESSIBILITY_MANAGER_SWIPE");
+                       break;
                        case TBT_APP_DALI_LONG_PRESS_GESTURE_SINGLE:
                                dali_view_add(view->navi, info, it, "TBT_APP_DALI_LONG_PRESS_GESTURE_SINGLE");
                        break;