From: Sunghyun kim Date: Thu, 24 Oct 2019 01:28:57 +0000 (+0900) Subject: [TBT][DALi] Fix tbt for unsupported device X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d49a33498542a2f954052afba5a181ef2367258c;p=test%2Ftct%2Fnative%2Fbehavior.git [TBT][DALi] Fix tbt for unsupported device Change-Id: I2302540b514514d8e2844fddab8e36136569bc0d --- diff --git a/release/binary-armv7l/org.tizen.tbtcoreapp-dali-1.0.0-arm.tpk b/release/binary-armv7l/org.tizen.tbtcoreapp-dali-1.0.0-arm.tpk index 07da7d4..d7e9878 100755 Binary files a/release/binary-armv7l/org.tizen.tbtcoreapp-dali-1.0.0-arm.tpk and b/release/binary-armv7l/org.tizen.tbtcoreapp-dali-1.0.0-arm.tpk differ diff --git a/release/binary-x86/org.tizen.tbtcoreapp-dali-1.0.0-x86.tpk b/release/binary-x86/org.tizen.tbtcoreapp-dali-1.0.0-x86.tpk index bc41fe9..62e7407 100755 Binary files a/release/binary-x86/org.tizen.tbtcoreapp-dali-1.0.0-x86.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-dali-1.0.0-x86.tpk differ diff --git a/tbtcoreapp-dali/src/view/tbt-dali-accessibilty-manager-tap-view.cpp b/tbtcoreapp-dali/src/view/tbt-dali-accessibilty-manager-tap-view.cpp index e90765f..fe3d0a6 100644 --- a/tbtcoreapp-dali/src/view/tbt-dali-accessibilty-manager-tap-view.cpp +++ b/tbtcoreapp-dali/src/view/tbt-dali-accessibilty-manager-tap-view.cpp @@ -104,6 +104,10 @@ TBTDaliAccessibilityManagerTapView::TBTDaliAccessibilityManagerTapView(Applicati lblActionReadSignal=TextLabel::DownCast(mTableView.GetChildAt(1)); lblActionZoomSignal=TextLabel::DownCast(mTableView.GetChildAt(2)); lblActionReadIndicatorInformationSignal=TextLabel::DownCast(mTableView.GetChildAt(3)); + + // this signal is used no longer because indicator is deprecated. So this test is passed unconditionally. + lblActionReadIndicatorInformationSignal.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN); + lblActionReadPauseResumeSignal=TextLabel::DownCast(mTableView.GetChildAt(4)); lblActionStartStopSignal=TextLabel::DownCast(mTableView.GetChildAt(5)); // lblActionReadFromTopSignal=TextLabel::DownCast(mTableView.GetChildAt(6)); diff --git a/tbtcoreapp-dali/src/view/tbt-dali-stage-view.cpp b/tbtcoreapp-dali/src/view/tbt-dali-stage-view.cpp index 426667b..568539d 100644 --- a/tbtcoreapp-dali/src/view/tbt-dali-stage-view.cpp +++ b/tbtcoreapp-dali/src/view/tbt-dali-stage-view.cpp @@ -79,6 +79,9 @@ TBTDaliStageView::TBTDaliStageView(Application& mApplication, app_control_h _con txtTouch=TextLabel::DownCast(ctlBody.GetChildAt(4)); txtWheel=TextLabel::DownCast(ctlBody.GetChildAt(5)); + // wheel event can't test in TM1. So this test is passed unconditionally. + txtWheel.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN); + 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);