[TBT][All][Non-ACR][5.0 tbt porting, dali widget fix]

Change-Id: I291daeb0faf948da4815d0546d481b1081050116
Signed-off-by: nibha2 <nibha.sharma@samsung.com>

diff --git a/release/binary-armv7l/install.sh b/release/binary-armv7l/install.sh
index c2d2b55347c79852ba866ac3cac54b11ced7ad7b..83808882939c0ff3cd9b3781df0c8d259b875b06 100755 (executable)
--- a/release/binary-armv7l/install.sh
+++ b/release/binary-armv7l/install.sh
@@ -38,6 +38,7 @@ sdb push org.tizen.tbtcoreapp-1.0.0-arm.tpk /tmp
 sdb push org.tizen.tbt_pushtestapp-1.0.0-arm.tpk /tmp
 sdb push org.tizen.tbt_ui_viewmgr-1.0.0-arm.tpk /tmp
 sdb push org.example.multiclass-1.0.0-arm.tpk /tmp
+sdb push org.example.widget-1.0.0-arm.tpk /tmp
 
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.coretbt_dataprovider-1.0.0-arm.tpk" $EXECUTION_USER
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.coretbt_serviceapp-1.0.0-arm.tpk" $EXECUTION_USER
@@ -50,6 +51,7 @@ sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.tbtcoreapp-dali-1.0.0-arm.tp
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.tbt_pushtestapp-1.0.0-arm.tpk" $EXECUTION_USER
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.tbt_ui_viewmgr-1.0.0-arm.tpk" $EXECUTION_USER
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.example.multiclass-1.0.0-arm.tpk" $EXECUTION_USER
+sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.example.widget-1.0.0-arm.tpk" $EXECUTION_USER
 
 sdb push dog_1024_960.gif /home/$EXECUTION_USER/media/Images
 sdb push SampleMP3.mp3 /home/$EXECUTION_USER/media/Sounds

diff --git a/release/binary-armv7l/org.example.widget-1.0.0-arm.tpk b/release/binary-armv7l/org.example.widget-1.0.0-arm.tpk
new file mode 100755 (executable)
index 0000000..bce0878
Binary files /dev/null and b/release/binary-armv7l/org.example.widget-1.0.0-arm.tpk differ

diff --git a/release/binary-armv7l/org.tizen.tbtcoreapp-dali-1.0.0-arm.tpk b/release/binary-armv7l/org.tizen.tbtcoreapp-dali-1.0.0-arm.tpk
index 4214eab6c3c0c180e298314a54c0aba7ed44299a..4a0c7613b44b1734bea7aa022908f7c9c6a88faa 100755 (executable)
Binary files a/release/binary-armv7l/org.tizen.tbtcoreapp-dali-1.0.0-arm.tpk and b/release/binary-armv7l/org.tizen.tbtcoreapp-dali-1.0.0-arm.tpk differ

diff --git a/release/binary-x86/install.sh b/release/binary-x86/install.sh
index 26b279cd505f5a9acaa52f8bb814958a5fccf452..b34042210872fa9d5be8fbddec680fb8b0865c34 100755 (executable)
--- a/release/binary-x86/install.sh
+++ b/release/binary-x86/install.sh
@@ -35,6 +35,8 @@ sdb push org.tizen.tbtcoreapp-dali-1.0.0-x86.tpk /tmp
 sdb push org.tizen.tbtcoreapp-1.0.0-x86.tpk /tmp
 sdb push org.tizen.tbt_pushtestapp-1.0.0-x86.tpk /tmp
 sdb push org.tizen.tbt_ui_viewmgr-1.0.0-x86.tpk /tmp
+sdb push org.example.widget-1.0.0-x86.tpk /tmp
+sdb push org.example.multiclass-1.0.0-x86.tpk /tmp
 
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.coretbt_dataprovider-1.0.0-x86.tpk" $EXECUTION_USER
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.coretbt_serviceapp-1.0.0-x86.tpk" $EXECUTION_USER
@@ -46,6 +48,8 @@ sdb shell pkgcmd -i -t tpk -p /tmp/org.tizen.tbt-ime-1.0.0-x86.tpk
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.tbtcoreapp-dali-1.0.0-x86.tpk" $EXECUTION_USER
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.tbt_pushtestapp-1.0.0-x86.tpk" $EXECUTION_USER
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.tbt_ui_viewmgr-1.0.0-x86.tpk" $EXECUTION_USER
+sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.example.widget-1.0.0-x86.tpk" $EXECUTION_USER
+sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.example.multiclass-1.0.0-x86.tpk" $EXECUTION_USER
 
 sdb root on
 

diff --git a/release/binary-x86/org.example.widget-1.0.0-x86.tpk b/release/binary-x86/org.example.widget-1.0.0-x86.tpk
new file mode 100755 (executable)
index 0000000..cd60498
Binary files /dev/null and b/release/binary-x86/org.example.widget-1.0.0-x86.tpk differ

diff --git a/release/binary-x86/org.tizen.tbtcoreapp-dali-1.0.0-x86.tpk b/release/binary-x86/org.tizen.tbtcoreapp-dali-1.0.0-x86.tpk
index 7db50035e06ebc8123a890b0efd8ac95687b5420..b9271c443ee6186fadc3363565205bab76d1ded0 100755 (executable)
Binary files a/release/binary-x86/org.tizen.tbtcoreapp-dali-1.0.0-x86.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-dali-1.0.0-x86.tpk differ

diff --git a/scripts_tpk/tpkbuild.sh b/scripts_tpk/tpkbuild.sh
index 84d83837b275d7f36cdbcc585b21ff3deabbc575..5b944b33a915c71a0f83936acf807aa5b9b6c928 100755 (executable)
--- a/scripts_tpk/tpkbuild.sh
+++ b/scripts_tpk/tpkbuild.sh
@@ -152,6 +152,11 @@ modulearray=(org.tizen.coretbt_dataprovider org.tizen.coretbt_serviceapp org.tiz
                                echo ""$reset
                        fi
                done
+               sdb push $PWD/release/binary-$ARCH/org.example.widget-1.0.0-$ARCH_TYPE.tpk /tmp
+               echo ""$reset
+               echo $green"Installing Package $MOD_NAME"
+               sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.example.widget-1.0.0-$ARCH_TYPE.tpk" $EXECUTION_USER
+               echo ""$reset
        elif [ "$MOD_NAME" =  "multiclass" ]; then
                eval launcher=(`sdb shell "app_launcher -l | grep org.example.$MOD_NAME"`)
                val=${launcher[1]}
@@ -185,6 +190,15 @@ modulearray=(org.tizen.coretbt_dataprovider org.tizen.coretbt_serviceapp org.tiz
                        echo ""$reset
                fi
         fi
+       echo "$MOD_NAME"
+       if [ "$MOD_NAME" = "tbtcoreapp-dali" ]; then
+                 sdb push $PWD/release/binary-$ARCH/org.example.widget-1.0.0-$ARCH_TYPE.tpk /tmp
+                 echo ""$reset
+                 echo $green"Installing Package $MOD_NAME"
+                 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.example.widget-1.0.0-$ARCH_TYPE.tpk" $EXECUTION_USER
+                 echo ""$reset
+        fi
+
        echo ""$reset
        echo $yellow"Pushing media files"
        sdb push $PWD/release/binary-$ARCH/dog_1024_960.gif /home/$EXECUTION_USER/media/Images

diff --git a/tbtcoreapp-dali/src/view/tbt-dali-widget-view.cpp b/tbtcoreapp-dali/src/view/tbt-dali-widget-view.cpp
index 1755935b0f8006e007b597b1b731d046ff3007d4..e437eeafac2ebd8d577d89e8f411b57c54aef73e 100644 (file)
--- a/tbtcoreapp-dali/src/view/tbt-dali-widget-view.cpp
+++ b/tbtcoreapp-dali/src/view/tbt-dali-widget-view.cpp
@@ -100,12 +100,12 @@ TBTDaliWidgetView::TBTDaliWidgetView(Application& mApplication, app_control_h _c
        mTableView.AddChild(mWidgetView, TableView::CellPosition(4,0));
        mTableView.SetFixedHeight(4, 0.9*bodySize.width/2);
 
-       mWidgetView_1 = mWidgetViewManager.AddWidget("org.tizen.no.widget", "", bodySize.width, 0.9*bodySize.width/2, 2000.0 );
+       mWidgetView_1 = mWidgetViewManager.AddWidget("org.example.widget", "", bodySize.width, 0.9*bodySize.width/2, 2000.0 );
        mWidgetView_1.SetParentOrigin( ParentOrigin::TOP_LEFT );
        mWidgetView_1.SetAnchorPoint( AnchorPoint::TOP_LEFT );
        mWidgetView_1.SetBackgroundColor( Vector4(0.0f, 0.0f, 0.0f, 0.0f) );
        mWidgetView_1.SetPosition( 0.0f, 0.0f );
-       mWidgetView_1.WidgetCreationAbortedSignal().Connect( this, &TBTDaliWidgetView::onWidgetCreationAbortedSignal );
+       //mWidgetView_1.WidgetCreationAbortedSignal().Connect( this, &TBTDaliWidgetView::onWidgetCreationAbortedSignal );
 
        mTableView.AddChild(mWidgetView_1, TableView::CellPosition(5,0));
        mTableView.SetFixedHeight(5, 0.9*bodySize.width/2);
@@ -177,6 +177,7 @@ bool TBTDaliWidgetView::OnButtonClicked( Button button )
        else if(btnActivate==button)
        {
                DBG("btnActivate click");
+               mWidgetView_1.WidgetCreationAbortedSignal().Connect( this, &TBTDaliWidgetView::onWidgetCreationAbortedSignal );
                mWidgetView_1.ActivateFaultedWidget();
        }