Removed redundant Logging & Mesh sorting examples as well as adding ESC handling to some demos

Change-Id: Ifefc497bb0f5e5f37670add8a2934df47619e83b

17 files changed, 44 insertions, 1116 deletions

diff --git a/com.samsung.dali-demo.xml b/com.samsung.dali-demo.xml
index df0424cc..7dcb04c2 100644
--- a/com.samsung.dali-demo.xml
+++ b/com.samsung.dali-demo.xml
@@ -109,9 +109,6 @@
 	<ui-application appid="text-scrolling.example" exec="/usr/apps/com.samsung.dali-demo/bin/text-scrolling.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
 		<label>Text Scrolling</label>
 	</ui-application>
-	<ui-application appid="logging.example" exec="/usr/apps/com.samsung.dali-demo/bin/logging.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
-		<label>Logging</label>
-	</ui-application>
 	<ui-application appid="animated-shapes.example" exec="/usr/apps/com.samsung.dali-demo/bin/animated-shapes.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
 		<label>Animated shapes</label>
 	</ui-application>
diff --git a/examples-reel/dali-examples-reel.cpp b/examples-reel/dali-examples-reel.cpp
index f2691e27..ee7a9d77 100644
--- a/examples-reel/dali-examples-reel.cpp
+++ b/examples-reel/dali-examples-reel.cpp
@@ -56,10 +56,8 @@ int DALI_EXPORT_API main(int argc, char **argv)
   demo.AddExample(Example("image-view-svg.example", DALI_DEMO_STR_TITLE_IMAGE_VIEW_SVG));
   demo.AddExample(Example("image-view-url.example", DALI_DEMO_STR_TITLE_IMAGE_VIEW_URL));
   demo.AddExample(Example("line-mesh.example", DALI_DEMO_STR_TITLE_LINE_MESH));
-  demo.AddExample(Example("logging.example", DALI_DEMO_STR_TITLE_LOGGING));
   demo.AddExample(Example("magnifier.example", DALI_DEMO_STR_TITLE_MAGNIFIER));
   demo.AddExample(Example("mesh-morph.example", DALI_DEMO_STR_TITLE_MESH_MORPH));
-  demo.AddExample(Example("mesh-sorting.example", DALI_DEMO_STR_TITLE_MESH_SORTING));
   demo.AddExample(Example("motion-stretch.example", DALI_DEMO_STR_TITLE_MOTION_STRETCH));
   demo.AddExample(Example("native-image-source.example", DALI_DEMO_STR_TITLE_NATIVE_IMAGE_SOURCE));
   demo.AddExample(Example("popup.example", DALI_DEMO_STR_TITLE_POPUP));
diff --git a/examples/clipping-draw-order/clipping-draw-order.cpp b/examples/clipping-draw-order/clipping-draw-order.cpp
index 1dd0e030..a2a48a44 100644
--- a/examples/clipping-draw-order/clipping-draw-order.cpp
+++ b/examples/clipping-draw-order/clipping-draw-order.cpp
@@ -52,6 +52,9 @@ public:
     Stage stage = Stage::GetCurrent();
     stage.SetBackgroundColor( Color::WHITE );
 
+    // Connect to the stage's key signal to allow Back and Escape to exit.
+    stage.KeyEventSignal().Connect( this, &ClippingDrawOrderVerification::OnKeyEvent );
+
     // Create the title label.
     TextLabel title = TextLabel::New( "Clipping draw order verification" );
     title.SetProperty( TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
@@ -204,23 +207,32 @@ public:
     return true;
   }
 
+  /**
+   * @brief Called when any key event is received
+   *
+   * Will use this to quit the application if Back or the Escape key is received
+   * @param[in] event The key event information
+   */
+  void OnKeyEvent( const KeyEvent& event )
+  {
+    if( event.state == KeyEvent::Down )
+    {
+      if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
+      {
+        mApplication.Quit();
+      }
+    }
+  }
+
 private:
   Application&  mApplication;
 };
 
-void RunVerification( Application& application )
-{
-  ClippingDrawOrderVerification verification( application );
-
-  application.MainLoop();
-}
-
 // Entry point for Linux & Tizen applications.
 int DALI_EXPORT_API main( int argc, char **argv )
 {
   Application application = Application::New( &argc, &argv );
-
-  RunVerification( application );
-
+  ClippingDrawOrderVerification verification( application );
+  application.MainLoop();
   return 0;
 }
diff --git a/examples/logging/logging-example.cpp b/examples/logging/logging-example.cpp
deleted file mode 100644
index 21e1ef5e..00000000
--- a/examples/logging/logging-example.cpp
+++ /dev/null
@@ -1,712 +0,0 @@
-/*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include "shared/view.h"
-#include <dali/dali.h>
-#include <dali-toolkit/dali-toolkit.h>
-#include <dali/devel-api/adaptor-framework/performance-logger.h>
-#include <sstream>
-
-using namespace Dali;
-
-// Define this so that it is interchangeable
-// "DP" stands for Device independent Pixels
-#define DP(x) x
-
-//enum ButtonType
-//{
-//  PUSH_BUTTON,
-//  TOGGLE_BUTTON
-//};
-//
-//struct ButtonItem
-//{
-//  ButtonType type;
-//  const char* name;
-//  const char* text;
-//  const char* altText;
-//};
-
-namespace
-{
-
-const char* const BACKGROUND_IMAGE = DEMO_IMAGE_DIR "background-gradient.jpg";
-const char* const TOOLBAR_IMAGE = DEMO_IMAGE_DIR "top-bar.png";
-
-const char* const TOOLBAR_TITLE = "Logging";
-//const int TOOLBAR_HEIGHT = 62;
-
-const int MARGIN_SIZE = 10;
-const int TOP_MARGIN = 85;
-
-const int LOGGER_GROUP_HEIGHT = 84;
-const int LOGGER_RADIO_GROUP_HEIGHT = 200;
-
-const int LOGGER_RADIO_SPACING = 48;
-
-const int CONSOLE_HEIGHT = 84;
-
-const int BUTTON_WIDTH = 200;
-const int BUTTON_HEIGHT = LOGGER_GROUP_HEIGHT - MARGIN_SIZE * 2;
-
-const Vector4 BACKGROUND_COLOUR( 1.0f, 1.0f, 1.0f, 0.15f );
-
-// Button IDs
-const char* const LOGGER_1_RADIO_ID = "LOGGER_1_RADIO";
-const char* const LOGGER_2_RADIO_ID = "LOGGER_2_RADIO";
-const char* const LOGGER_3_RADIO_ID = "LOGGER_3_RADIO";
-
-const char* const FREQUENCY_1_RADIO_ID = "FREQUENCY_1_RADIO";
-const char* const FREQUENCY_2_RADIO_ID = "FREQUENCY_2_RADIO";
-const char* const FREQUENCY_3_RADIO_ID = "FREQUENCY_3_RADIO";
-
-const char* const CREATE_BUTTON_ID = "CREATE_BUTTON";
-const char* const DELETE_BUTTON_ID = "DELETE_BUTTON";
-const char* const START_BUTTON_ID = "START_BUTTON";
-const char* const STOP_BUTTON_ID = "STOP_BUTTON";
-const char* const HIGH_FREQ_BUTTON_ID = "INC_FREQ_BUTTON";
-const char* const LOW_FREQ_BUTTON_ID = "DEC_FREQ_BUTTON";
-const char* const ENABLE_BUTTON_ID = "ENABLE_BUTTON";
-const char* const DISABLE_BUTTON_ID = "DISABLE_BUTTON";
-const char* const VSYNC_BUTTON_ID = "VSYNC_BUTTON";
-
-const char* const CREATE_BUTTON_TEXT = "Create";
-const char* const DELETE_BUTTON_TEXT = "Delete";
-const char* const START_BUTTON_TEXT = "Start";
-const char* const STOP_BUTTON_TEXT = "Stop";
-const char* const ENABLE_BUTTON_TEXT = "Enable";
-const char* const DISABLE_BUTTON_TEXT = "Disable";
-const char* const VSYNC_BUTTON_TEXT = "Vsync";
-
-const char* const FREQUENCY_1_RADIO_TEXT = "1";
-const char* const FREQUENCY_2_RADIO_TEXT = "2";
-const char* const FREQUENCY_3_RADIO_TEXT = "10";
-
-const char* const LOGGER_TEXT = "Logger:";
-const char* const FREQUENCY_TEXT = "Frequency (sec):";
-
-const unsigned int NUM_LOGGERS = 3;
-
-const unsigned int HIGH_FREQUENCY = 1;   // Seconds
-const unsigned int MEDIUM_FREQUENCY = 2;   // Seconds
-const unsigned int LOW_FREQUENCY = 10;   // Seconds
-const unsigned int NUM_FREQUENCIES = 3;
-
-}  // namespace
-
-/**
- * This example is a test harness for performance loggers.
- *
- * Press one of the create buttons to create a logger. This will output on vsync at the default frequency (2 seconds).
- * In case nothing appears in the log, force a vsync by touching anywhere on the screen. Loggers can be deleted
- * with the delete buttons. They can be enabled or disabled in which case logging will appear or disappear in the console
- * respectively. To record information in a logger press the start and then stop button in succession quickly in between
- * the time period when it would print to the console. This is necessary as the logger is cleared of information when
- * it prints. The output will contain the smallest and largest times between start and stop recorded (minimum and maximum),
- * the total time recorded by the logger as well as the average and standard deviation of all the times recorded. The
- * frequency of log output can be set to high frequency (every 1 second) or low frequency (every 10 seconds).
- */
-class LoggingController: public ConnectionTracker
-{
- public:
-
-  LoggingController( Application& application )
-  : mApplication( application ),
-    mView(),
-    mToolBar(),
-    mContentLayer(),
-    mAnimation(),
-    mPerformanceLoggerNames(),
-    mPerformanceLoggers(),
-    mCurrentLogger( 0 ),
-    mLoggerStates(),
-    mLogRadioButtons(),
-    mFrequencyRadioButtons()
-  {
-    // Connect to the Application's Init signal
-    mApplication.InitSignal().Connect( this, &LoggingController::Create );
-  }
-
-  ~LoggingController()
-  {
-    // Nothing to do here
-  }
-
-  void Create( Application& application )
-  {
-    // The Init signal is received once (only) during the Application lifetime
-
-    mCurrentLogger = 0;
-    mPerformanceLoggers.reserve( NUM_LOGGERS );
-    mPerformanceLoggers.resize( NUM_LOGGERS );
-
-    mPerformanceLoggerNames.reserve( NUM_LOGGERS );
-    mPerformanceLoggerNames.resize( NUM_LOGGERS );
-
-    mLoggerStates.reserve( NUM_LOGGERS );
-    mLoggerStates.resize( NUM_LOGGERS );
-
-    mLogRadioButtons.reserve( NUM_LOGGERS );
-    mLogRadioButtons.resize( NUM_LOGGERS );
-
-    mFrequencyRadioButtons.reserve( NUM_FREQUENCIES );
-    mFrequencyRadioButtons.resize( NUM_FREQUENCIES );
-
-    // Respond to key events
-    Stage::GetCurrent().KeyEventSignal().Connect(this, &LoggingController::OnKeyEvent);
-
-    // Creates a default view with a default tool bar.
-    // The view is added to the stage.
-    mContentLayer = DemoHelper::CreateView( application,
-                                            mView,
-                                            mToolBar,
-                                            BACKGROUND_IMAGE,
-                                            TOOLBAR_IMAGE,
-                                            TOOLBAR_TITLE );
-
-    Toolkit::TableView contentTable = Toolkit::TableView::New( 6, 1 );
-    contentTable.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
-    contentTable.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
-    contentTable.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-    contentTable.SetParentOrigin( ParentOrigin::TOP_LEFT );
-    contentTable.SetCellPadding( Size( MARGIN_SIZE, MARGIN_SIZE * 0.5f ) );
-
-    for( unsigned int i = 0; i < contentTable.GetRows(); ++i )
-    {
-      contentTable.SetFitHeight( i );
-    }
-
-    contentTable.SetPosition( 0.0f, TOP_MARGIN );
-
-    mContentLayer.Add( contentTable );
-
-
-    // Logger selector radio group
-    Toolkit::TableView radioGroupBackground = Toolkit::TableView::New( 2, 1 );
-    radioGroupBackground.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
-    radioGroupBackground.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
-    radioGroupBackground.SetBackgroundColor( BACKGROUND_COLOUR );
-    radioGroupBackground.SetParentOrigin( ParentOrigin::TOP_LEFT );
-    radioGroupBackground.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-    radioGroupBackground.SetCellPadding( Size( MARGIN_SIZE, MARGIN_SIZE * 0.5f ) );
-
-    contentTable.Add( radioGroupBackground );
-
-    // Label
-    {
-      Toolkit::TextLabel label = Toolkit::TextLabel::New( LOGGER_TEXT );
-      label.SetParentOrigin( ParentOrigin::TOP_LEFT );
-      label.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-      label.SetPosition( DP(MARGIN_SIZE), DP(MARGIN_SIZE) );
-      label.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
-
-      radioGroupBackground.Add( label );
-      radioGroupBackground.SetFitHeight( 0 );
-    }
-
-    // Radio group
-    Toolkit::TableView radioButtonsGroup = Toolkit::TableView::New( 3, 1 );
-    radioButtonsGroup.SetCellPadding( Size( 0.0f, MARGIN_SIZE * 0.5f ) );
-    radioButtonsGroup.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
-    for( unsigned int i = 0; i < radioButtonsGroup.GetRows(); ++i )
-    {
-      radioButtonsGroup.SetFitHeight( i );
-    }
-    radioButtonsGroup.SetFitWidth( 0 );
-
-    radioGroupBackground.Add( radioButtonsGroup );
-    radioGroupBackground.SetFitHeight( 1 );
-
-    int radioX = 0;
-    int radioY = 0;
-
-    // Radio 1
-    {
-      Toolkit::RadioButton radioButton = Toolkit::RadioButton::New();
-      radioButton.SetName( LOGGER_1_RADIO_ID );
-      radioButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
-      radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-      radioButton.SetPosition( DP(radioX), DP(radioY) );
-      radioButton.SetProperty( Toolkit::Button::Property::SELECTED, true );
-
-      radioButton.StateChangedSignal().Connect( this, &LoggingController::LoggingRadioSelect );
-
-      radioButtonsGroup.Add( radioButton );
-      mLogRadioButtons[0] = radioButton;
-    }
-
-    // Radio 2
-    {
-      radioY += LOGGER_RADIO_SPACING;
-
-      Toolkit::RadioButton radioButton = Toolkit::RadioButton::New();
-      radioButton.SetName( LOGGER_2_RADIO_ID );
-      radioButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
-      radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-      radioButton.SetPosition( DP(radioX), DP(radioY) );
-
-      radioButton.StateChangedSignal().Connect( this, &LoggingController::LoggingRadioSelect );
-
-      radioButtonsGroup.Add( radioButton );
-      mLogRadioButtons[1] = radioButton;
-    }
-
-    // Radio 3
-    {
-      radioY += LOGGER_RADIO_SPACING;
-
-      Toolkit::RadioButton radioButton = Toolkit::RadioButton::New();
-      radioButton.SetName( LOGGER_3_RADIO_ID );
-      radioButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
-      radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-      radioButton.SetPosition( DP(radioX), DP(radioY) );
-
-      radioButton.StateChangedSignal().Connect( this, &LoggingController::LoggingRadioSelect );
-
-      radioButtonsGroup.Add( radioButton );
-      mLogRadioButtons[2] = radioButton;
-    }
-
-    // Create/delete/disable group
-    Toolkit::TableView createGroupBackground = Toolkit::TableView::New( 1, 2 );
-    createGroupBackground.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
-    createGroupBackground.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
-    createGroupBackground.SetBackgroundColor( BACKGROUND_COLOUR );
-    createGroupBackground.SetCellPadding( Size( MARGIN_SIZE, MARGIN_SIZE ) );
-    createGroupBackground.SetFitHeight( 0 );
-
-    contentTable.Add( createGroupBackground );
-
-    {
-      Toolkit::PushButton button = Toolkit::PushButton::New();
-      button.SetName( CREATE_BUTTON_ID );
-      button.SetProperty( Toolkit::Button::Property::LABEL, CREATE_BUTTON_TEXT);
-      button.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
-      button.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
-      button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
-
-      createGroupBackground.Add( button );
-    }
-
-    {
-      Toolkit::PushButton button = Toolkit::PushButton::New();
-      button.SetName( DELETE_BUTTON_ID );
-      button.SetProperty( Toolkit::Button::Property::LABEL, DELETE_BUTTON_TEXT);
-      button.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
-      button.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
-      button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
-
-      createGroupBackground.Add( button );
-    }
-
-    // Start/stop group
-
-    Toolkit::TableView timingGroupBackground = Toolkit::TableView::New( 1, 2 );
-    timingGroupBackground.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
-    timingGroupBackground.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
-    timingGroupBackground.SetBackgroundColor( BACKGROUND_COLOUR );
-    timingGroupBackground.SetCellPadding( Size( MARGIN_SIZE, MARGIN_SIZE ) );
-    timingGroupBackground.SetFitHeight( 0 );
-
-    contentTable.Add( timingGroupBackground );
-
-    {
-      Toolkit::PushButton button = Toolkit::PushButton::New();
-      button.SetName( START_BUTTON_ID );
-      button.SetProperty( Toolkit::Button::Property::LABEL, START_BUTTON_TEXT);
-      button.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
-      button.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
-      button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
-
-      timingGroupBackground.Add( button );
-    }
-
-    {
-      Toolkit::PushButton button = Toolkit::PushButton::New();
-      button.SetName( STOP_BUTTON_ID );
-      button.SetProperty( Toolkit::Button::Property::LABEL, STOP_BUTTON_TEXT);
-      button.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
-      button.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
-      button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
-
-      timingGroupBackground.Add( button );
-    }
-
-    // Enable/disable group
-    Toolkit::TableView enableGroupBackground = Toolkit::TableView::New( 1, 2 );
-    enableGroupBackground.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
-    enableGroupBackground.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
-    enableGroupBackground.SetBackgroundColor( BACKGROUND_COLOUR );
-    enableGroupBackground.SetCellPadding( Size( MARGIN_SIZE, MARGIN_SIZE ) );
-    enableGroupBackground.SetFitHeight( 0 );
-
-    contentTable.Add( enableGroupBackground );
-
-    {
-      Toolkit::PushButton button = Toolkit::PushButton::New();
-      button.SetName( ENABLE_BUTTON_ID );
-      button.SetProperty( Toolkit::Button::Property::LABEL, ENABLE_BUTTON_TEXT);
-      button.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
-      button.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
-      button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
-
-      enableGroupBackground.Add( button );
-    }
-
-    {
-      Toolkit::PushButton button = Toolkit::PushButton::New();
-      button.SetName( DISABLE_BUTTON_ID );
-      button.SetProperty( Toolkit::Button::Property::LABEL, DISABLE_BUTTON_TEXT);
-      button.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
-      button.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
-      button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
-
-      enableGroupBackground.Add( button );
-    }
-
-    // Logger selector radio group
-    Toolkit::TableView frequencyRadioGroupBackground = Toolkit::TableView::New( 2, 1 );
-    frequencyRadioGroupBackground.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
-    frequencyRadioGroupBackground.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
-    frequencyRadioGroupBackground.SetBackgroundColor( BACKGROUND_COLOUR );
-    frequencyRadioGroupBackground.SetCellPadding( Size( MARGIN_SIZE, MARGIN_SIZE * 0.5f ) );
-    frequencyRadioGroupBackground.SetFitHeight( 0 );
-    frequencyRadioGroupBackground.SetFitHeight( 1 );
-
-    contentTable.Add( frequencyRadioGroupBackground );
-
-    // Label
-    {
-      Toolkit::TextLabel label = Toolkit::TextLabel::New( FREQUENCY_TEXT );
-
-      frequencyRadioGroupBackground.Add( label );
-    }
-
-    // Radio group
-    Toolkit::TableView frequencyRadioButtonsGroup = Toolkit::TableView::New( 1, 3 );
-    frequencyRadioButtonsGroup.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
-    frequencyRadioButtonsGroup.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
-    frequencyRadioButtonsGroup.SetFitHeight( 0 );
-    frequencyRadioButtonsGroup.SetPadding( Padding( 0.0f, 0.0f, MARGIN_SIZE, 0.0f ) );
-
-    frequencyRadioGroupBackground.Add( frequencyRadioButtonsGroup );
-
-    // Radio 1
-    {
-      Toolkit::RadioButton radioButton = Toolkit::RadioButton::New( FREQUENCY_1_RADIO_TEXT );
-      radioButton.SetName( FREQUENCY_1_RADIO_ID );
-
-      radioButton.StateChangedSignal().Connect( this, &LoggingController::FrequencyRadioSelect );
-
-      frequencyRadioButtonsGroup.Add( radioButton );
-      mFrequencyRadioButtons[0] = radioButton;
-    }
-
-    // Radio 2
-    {
-      Toolkit::RadioButton radioButton = Toolkit::RadioButton::New( FREQUENCY_2_RADIO_TEXT );
-      radioButton.SetName( FREQUENCY_2_RADIO_ID );
-
-      radioButton.SetProperty( Toolkit::Button::Property::SELECTED, true );
-
-      radioButton.StateChangedSignal().Connect( this, &LoggingController::FrequencyRadioSelect );
-
-      frequencyRadioButtonsGroup.Add( radioButton );
-      mFrequencyRadioButtons[1] = radioButton;
-    }
-
-    // Radio 3
-    {
-      Toolkit::RadioButton radioButton = Toolkit::RadioButton::New( FREQUENCY_3_RADIO_TEXT );
-      radioButton.SetName( FREQUENCY_3_RADIO_ID );
-
-      radioButton.StateChangedSignal().Connect( this, &LoggingController::FrequencyRadioSelect );
-
-      frequencyRadioButtonsGroup.Add( radioButton );
-      mFrequencyRadioButtons[2] = radioButton;
-    }
-
-    // Vsync group
-    Toolkit::TableView vsyncGroupBackground = Toolkit::TableView::New( 1, 1 );
-    vsyncGroupBackground.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
-    vsyncGroupBackground.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
-    vsyncGroupBackground.SetBackgroundColor( BACKGROUND_COLOUR );
-    vsyncGroupBackground.SetCellPadding( Size( MARGIN_SIZE, MARGIN_SIZE ) );
-    vsyncGroupBackground.SetFitHeight( 0 );
-
-    contentTable.Add( vsyncGroupBackground );
-
-    {
-      Toolkit::PushButton button = Toolkit::PushButton::New();
-      button.SetName( VSYNC_BUTTON_ID );
-      button.SetProperty( Toolkit::Button::Property::LABEL, VSYNC_BUTTON_TEXT);
-      button.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
-      button.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
-      button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
-
-      vsyncGroupBackground.Add( button );
-    }
-
-    WriteConsole();
-  }
-
-  void WriteConsole()
-  {
-    for( unsigned int i = 0; i < NUM_LOGGERS; ++i)
-    {
-      std::stringstream ss;
-      ss << (i + 1) << ") " << ((mPerformanceLoggers[i]) ? "Created" : "Deleted")
-         << ", " << ((mLoggerStates[i].isTiming) ? "Started" : "Stopped")
-         << ", " << ((mLoggerStates[i].isEnabled) ? "Enabled" : "Disabled");
-
-      mLogRadioButtons[i].SetProperty( Toolkit::Button::Property::LABEL, ss.str() );
-    }
-  }
-
-  bool LoggingRadioSelect( Toolkit::Button button )
-  {
-    bool isSelected = button.GetProperty( Toolkit::Button::Property::SELECTED ).Get<bool>();
-    if( !isSelected )
-    {
-      return true;
-    }
-
-    if( button.GetName() == LOGGER_1_RADIO_ID )
-    {
-      mCurrentLogger = 0;
-    }
-    else if( button.GetName() == LOGGER_2_RADIO_ID )
-    {
-      mCurrentLogger = 1;
-    }
-    else if( button.GetName() == LOGGER_3_RADIO_ID )
-    {
-      mCurrentLogger = 2;
-    }
-
-    UpdateState();
-
-    return true;
-  }
-
-  void UpdateState()
-  {
-    DALI_ASSERT_DEBUG( mCurrentLogger < mLoggerStates.size() );
-    const unsigned int frequency = mLoggerStates[mCurrentLogger].frequency;
-    if( frequency == HIGH_FREQUENCY )
-    {
-      mFrequencyRadioButtons[0].SetProperty( Toolkit::Button::Property::SELECTED, true );
-    }
-    else if( frequency == MEDIUM_FREQUENCY )
-    {
-      mFrequencyRadioButtons[1].SetProperty( Toolkit::Button::Property::SELECTED, true );
-    }
-    else if( frequency == LOW_FREQUENCY )
-    {
-      mFrequencyRadioButtons[2].SetProperty( Toolkit::Button::Property::SELECTED, true );
-    }
-  }
-
-  bool FrequencyRadioSelect( Toolkit::Button button )
-  {
-    bool isSelected = button.GetProperty( Toolkit::Button::Property::SELECTED ).Get<bool>();
-    if( !isSelected )
-    {
-      return true;
-    }
-
-    if( button.GetName() == FREQUENCY_1_RADIO_ID )
-    {
-      if( mPerformanceLoggers[mCurrentLogger] )
-      {
-        DALI_ASSERT_DEBUG( mCurrentLogger < mPerformanceLoggers.size() );
-        mPerformanceLoggers[mCurrentLogger].SetLoggingFrequency( HIGH_FREQUENCY );
-
-        DALI_ASSERT_DEBUG( mCurrentLogger < mLoggerStates.size() );
-        mLoggerStates[mCurrentLogger].frequency = HIGH_FREQUENCY;
-      }
-    }
-    else if( button.GetName() == FREQUENCY_2_RADIO_ID )
-    {
-      if( mPerformanceLoggers[mCurrentLogger] )
-      {
-        DALI_ASSERT_DEBUG( mCurrentLogger < mPerformanceLoggers.size() );
-        mPerformanceLoggers[mCurrentLogger].SetLoggingFrequency( MEDIUM_FREQUENCY );
-
-        DALI_ASSERT_DEBUG( mCurrentLogger < mLoggerStates.size() );
-        mLoggerStates[mCurrentLogger].frequency = MEDIUM_FREQUENCY;
-      }
-    }
-    else if( button.GetName() == FREQUENCY_3_RADIO_ID )
-    {
-      if( mPerformanceLoggers[mCurrentLogger] )
-      {
-        DALI_ASSERT_DEBUG( mCurrentLogger < mPerformanceLoggers.size() );
-        mPerformanceLoggers[mCurrentLogger].SetLoggingFrequency( LOW_FREQUENCY );
-
-        DALI_ASSERT_DEBUG( mCurrentLogger < mLoggerStates.size() );
-        mLoggerStates[mCurrentLogger].frequency = LOW_FREQUENCY;
-      }
-    }
-
-    return true;
-  }
-
-  void OnKeyEvent( const KeyEvent& event )
-  {
-    if( event.state == KeyEvent::Down )
-    {
-      if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
-      {
-        // Exit application when click back or escape.
-        mApplication.Quit();
-      }
-    }
-  }
-
-  bool OnButtonClicked(Toolkit::Button button)
-  {
-    if( button.GetName() == CREATE_BUTTON_ID )
-    {
-      std::stringstream ss;
-      ss << "Test logger " << (mCurrentLogger + 1);
-
-      DALI_ASSERT_DEBUG( mCurrentLogger < mPerformanceLoggerNames.size() );
-      mPerformanceLoggerNames[mCurrentLogger] = ss.str();
-
-      DALI_ASSERT_DEBUG( mCurrentLogger < mPerformanceLoggers.size() );
-      mPerformanceLoggers[mCurrentLogger] = Dali::PerformanceLogger::New( mPerformanceLoggerNames[mCurrentLogger].c_str() );
-
-      DALI_ASSERT_DEBUG( mCurrentLogger < mLoggerStates.size() );
-      mLoggerStates[mCurrentLogger].isTiming = false;
-      mLoggerStates[mCurrentLogger].isEnabled = true;
-      mLoggerStates[mCurrentLogger].frequency = MEDIUM_FREQUENCY;
-
-      UpdateState();
-    }
-    else if ( button.GetName() == DELETE_BUTTON_ID )
-    {
-      DALI_ASSERT_DEBUG( mCurrentLogger < mPerformanceLoggers.size() );
-      mPerformanceLoggers[mCurrentLogger].Reset();
-
-      DALI_ASSERT_DEBUG( mCurrentLogger < mLoggerStates.size() );
-      mLoggerStates[mCurrentLogger].isTiming = false;
-      mLoggerStates[mCurrentLogger].isEnabled = true;
-      mLoggerStates[mCurrentLogger].frequency = MEDIUM_FREQUENCY;
-
-      UpdateState();
-    }
-    else if ( button.GetName() == START_BUTTON_ID )
-    {
-      if( mPerformanceLoggers[mCurrentLogger] )
-      {
-        DALI_ASSERT_DEBUG( mCurrentLogger < mPerformanceLoggers.size() );
-        mPerformanceLoggers[mCurrentLogger].AddMarker( Dali::PerformanceLogger::START_EVENT );
-
-        DALI_ASSERT_DEBUG( mCurrentLogger < mLoggerStates.size() );
-        mLoggerStates[mCurrentLogger].isTiming = true;
-      }
-    }
-    else if ( button.GetName() == STOP_BUTTON_ID )
-    {
-      if( mPerformanceLoggers[mCurrentLogger] )
-      {
-        DALI_ASSERT_DEBUG( mCurrentLogger < mPerformanceLoggers.size() );
-        mPerformanceLoggers[mCurrentLogger].AddMarker( Dali::PerformanceLogger::END_EVENT );
-
-        DALI_ASSERT_DEBUG( mCurrentLogger < mLoggerStates.size() );
-        mLoggerStates[mCurrentLogger].isTiming = false;
-      }
-    }
-    else if ( button.GetName() == ENABLE_BUTTON_ID )
-    {
-      if( mPerformanceLoggers[mCurrentLogger] )
-      {
-        DALI_ASSERT_DEBUG( mCurrentLogger < mPerformanceLoggers.size() );
-        mPerformanceLoggers[mCurrentLogger].EnableLogging( true );
-
-        DALI_ASSERT_DEBUG( mCurrentLogger < mLoggerStates.size() );
-        mLoggerStates[mCurrentLogger].isEnabled = true;
-      }
-    }
-    else if ( button.GetName() == DISABLE_BUTTON_ID )
-    {
-      if( mPerformanceLoggers[mCurrentLogger] )
-      {
-        DALI_ASSERT_DEBUG( mCurrentLogger < mPerformanceLoggers.size() );
-        mPerformanceLoggers[mCurrentLogger].EnableLogging( false );
-
-        DALI_ASSERT_DEBUG( mCurrentLogger < mLoggerStates.size() );
-        mLoggerStates[mCurrentLogger].isEnabled = false;
-      }
-    }
-
-    WriteConsole();
-
-    return true;
-  }
-
-private:
-
-  struct LoggerState
-  {
-    LoggerState() : frequency( 0 ), isTiming( false ), isEnabled( true ) {}
-
-    unsigned int frequency;
-    bool isTiming;
-    bool isEnabled;
-  };
-
-  Application&      mApplication;
-  Toolkit::Control  mView;                   ///< The View instance.
-  Toolkit::ToolBar  mToolBar;                ///< The View's Toolbar.
-  Layer             mContentLayer;           ///< Content layer
-
-  Animation      mAnimation;
-
-  typedef std::vector< std::string > Strings;
-  Strings mPerformanceLoggerNames;
-
-  typedef std::vector< Dali::PerformanceLogger > PerformanceLoggers;
-  PerformanceLoggers mPerformanceLoggers;
-  unsigned int mCurrentLogger;
-
-  typedef std::vector< LoggerState > LoggerStates;
-  LoggerStates mLoggerStates;
-
-  typedef std::vector< Toolkit::RadioButton > RadioButtons;
-  RadioButtons mLogRadioButtons;
-  RadioButtons mFrequencyRadioButtons;
-};
-
-void RunTest( Application& application )
-{
-  LoggingController test( application );
-
-  application.MainLoop();
-}
-
-// Entry point for Linux & Tizen applications
-//
-int DALI_EXPORT_API main( int argc, char **argv )
-{
-  Application application = Application::New( &argc, &argv, DEMO_THEME_PATH );
-
-  RunTest( application );
-
-  return 0;
-}
diff --git a/examples/mesh-sorting/mesh-sorting-example.cpp b/examples/mesh-sorting/mesh-sorting-example.cpp
deleted file mode 100644
index 35300d5e..00000000
--- a/examples/mesh-sorting/mesh-sorting-example.cpp
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <dali-toolkit/dali-toolkit.h>
-#include <stdio.h>
-#include <sstream>
-#include <cstring>
-
-// INTERNAL INCLUDES
-#include "shared/view.h"
-#include "shared/utility.h"
-
-using namespace Dali;
-
-namespace
-{
-
-const char* IMAGES[] =
-{
-  DEMO_IMAGE_DIR "people-medium-1.jpg",
-  DEMO_IMAGE_DIR "people-medium-4.jpg",
-  DEMO_IMAGE_DIR "people-medium-11.jpg",
-  DEMO_IMAGE_DIR "people-small-16.jpg",
-  DEMO_IMAGE_DIR "people-medium-15.jpg",
-  DEMO_IMAGE_DIR "people-medium-6.jpg",
-};
-const unsigned int NUMBER_OF_SAMPLES(sizeof(IMAGES)/sizeof(const char*));
-
-
-#define MAKE_SHADER(A)#A
-
-const char* VERTEX_SHADER = MAKE_SHADER(
-uniform   highp   float   uHue;
-attribute mediump vec2    aPosition;
-attribute highp   vec2    aTexCoord;
-varying   mediump vec2    vTexCoord;
-uniform   mediump mat4    uMvpMatrix;
-uniform   mediump vec3    uSize;
-varying   mediump vec3    vGlobColor;
-
-vec3 hsv2rgb(vec3 c)
-{
-  vec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);
-  vec3 p = abs(fract(c.xxx + K.xyz) * 6.0 - K.www);
-  return c.z * mix(K.xxx, clamp(p - K.xxx, 0.0, 1.0), c.y);
-}
-
-void main()
-{
-  mediump vec4 vertexPosition = vec4(aPosition, 0.0, 1.0);
-  vertexPosition.xyz *= uSize;
-  vertexPosition = uMvpMatrix * vertexPosition;
-  vGlobColor = hsv2rgb( vec3( clamp(uHue, 0.0, 1.0), 1.0, 1.0 ) );
-
-  vTexCoord = aTexCoord;
-  gl_Position = vertexPosition;
-}
-);
-
-const char* FRAGMENT_SHADER = MAKE_SHADER(
-varying mediump vec2  vTexCoord;
-varying mediump vec3  vGlobColor;
-uniform lowp    vec4  uColor;
-uniform sampler2D     sTexture;
-
-void main()
-{
-  gl_FragColor = texture2D( sTexture, vTexCoord ) * uColor * vec4(vGlobColor, 1.0) ;
-}
-);
-
-} // anonymous namespace
-
-// This example shows how to use a simple mesh
-//
-class ExampleController : public ConnectionTracker
-{
-public:
-
-  /**
-   * The example controller constructor.
-   * @param[in] application The application instance
-   */
-  ExampleController( Application& application )
-  : mApplication( application ),
-    mZMode(0)
-  {
-    // Connect to the Application's Init signal
-    mApplication.InitSignal().Connect( this, &ExampleController::Create );
-    memset(mDepthIndices, 0, sizeof(mDepthIndices));
-  }
-
-  /**
-   * The example controller destructor
-   */
-  ~ExampleController()
-  {
-    // Nothing to do here;
-  }
-
-  /**
-   * Invoked upon creation of application
-   * @param[in] application The application instance
-   */
-  void Create( Application& application )
-  {
-    Stage stage = Stage::GetCurrent();
-    stage.KeyEventSignal().Connect(this, &ExampleController::OnKeyEvent);
-
-    mStageSize = stage.GetSize();
-
-    // The Init signal is received once (only) during the Application lifetime
-
-    // Hide the indicator bar
-    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
-
-    mShader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER );
-    mGeometry = DemoHelper::CreateTexturedQuad();
-
-    TextureSet firstTextureSet;
-
-    for( unsigned i=0; i<NUMBER_OF_SAMPLES; ++i)
-    {
-      Texture texture = DemoHelper::LoadTexture( IMAGES[i] );
-      TextureSet textureSet = TextureSet::New();
-      textureSet.SetTexture( 0u, texture );
-      if( i==0 ) { firstTextureSet = textureSet; }
-
-      Renderer renderer = Renderer::New( mGeometry, mShader );
-      renderer.SetTextures( textureSet );
-      Actor meshActor = Actor::New();
-      mActors[i] = meshActor;
-      meshActor.AddRenderer( renderer );
-      meshActor.SetSize(175, 175);
-      meshActor.RegisterProperty("index", (int)i);
-
-      renderer.SetProperty( Renderer::Property::DEPTH_INDEX, 0 );
-      // Test with actor alpha
-      meshActor.SetParentOrigin( ParentOrigin::CENTER );
-      meshActor.SetAnchorPoint( AnchorPoint::CENTER );
-      meshActor.SetPosition( 40.0f*(i-(NUMBER_OF_SAMPLES*0.5f)), 40.0f*(i-(NUMBER_OF_SAMPLES*0.5f)), i*10 );
-
-      meshActor.SetOpacity( i%2?0.7f:1.0f );
-
-      meshActor.RegisterProperty("uHue", i/(float)NUMBER_OF_SAMPLES);
-
-      meshActor.TouchSignal().Connect(this, &ExampleController::OnTouched);
-      std::ostringstream oss;
-      oss << "Mesh Actor " << i;
-      meshActor.SetName(oss.str());
-      stage.Add( meshActor );
-    }
-
-    mActors[NUMBER_OF_SAMPLES-2].GetRendererAt(0).SetTextures( firstTextureSet );
-
-    stage.GetRootLayer().TouchSignal().Connect(this, &ExampleController::OnStageTouched);
-  }
-
-  void PrintDepths()
-  {
-    switch( mZMode )
-    {
-      case 0:
-      {
-        printf("Children Z ordered back to front\n");
-        break;
-      }
-      case 1:
-      {
-        printf("All children set to same Z=0\n");
-        break;
-      }
-      case 2:
-      {
-        printf("Children Z ordered front to back\n");
-        break;
-      }
-    }
-
-    for( unsigned i=0; i<NUMBER_OF_SAMPLES; ++i)
-    {
-      printf("DepthIndex[%d]=%d\n", i, mDepthIndices[i]);
-    }
-    printf("\n");
-  }
-
-  bool OnTouched( Actor actor, const TouchData& event )
-  {
-    if( event.GetState( 0 ) == PointState::UP )
-    {
-      int index = actor.GetProperty<int>(actor.GetPropertyIndex("index"));
-
-      int newDepthIndex = (mDepthIndices[index] + 10) % 30;
-      mDepthIndices[index] = newDepthIndex;
-
-      Renderer renderer = actor.GetRendererAt(0);
-      renderer.SetProperty( Renderer::Property::DEPTH_INDEX, newDepthIndex);
-
-      PrintDepths();
-    }
-    return true;
-  }
-
-  bool OnStageTouched( Actor rootLayer, const TouchData& event )
-  {
-    if( event.GetState( 0 ) == PointState::UP )
-    {
-      switch( mZMode )
-      {
-        case 0:
-        {
-          mZMode = 1;
-          for(unsigned int i=1; i < rootLayer.GetChildCount(); ++i)
-          {
-            Actor child = rootLayer.GetChildAt(i);
-            child.SetZ( 0.0f );
-          }
-          PrintDepths();
-          break;
-        }
-        case 1:
-        {
-          mZMode = 2;
-          for(unsigned int i=1; i < rootLayer.GetChildCount(); ++i)
-          {
-            Actor child = rootLayer.GetChildAt(i);
-            child.SetZ( 100-i*10 );
-          }
-          PrintDepths();
-          break;
-        }
-        case 2:
-        {
-          mZMode = 0;
-          for(unsigned int i=1; i < rootLayer.GetChildCount(); ++i)
-          {
-            Actor child = rootLayer.GetChildAt(i);
-            child.SetZ( i*10 );
-          }
-          PrintDepths();
-          break;
-        }
-      }
-    }
-    return true;
-  }
-
-  /**
-   * Invoked whenever the quit button is clicked
-   * @param[in] button the quit button
-   */
-  bool OnQuitButtonClicked( Toolkit::Button button )
-  {
-    // quit the application
-    mApplication.Quit();
-    return true;
-  }
-
-  void OnKeyEvent(const KeyEvent& event)
-  {
-    if(event.state == KeyEvent::Down)
-    {
-      if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
-      {
-        mApplication.Quit();
-      }
-    }
-  }
-
-private:
-
-  Application&  mApplication;                             ///< Application instance
-  Vector3 mStageSize;                                     ///< The size of the stage
-
-  Shader   mShader;
-  Geometry mGeometry;
-
-  int mDepthIndices[NUMBER_OF_SAMPLES];
-  Actor mActors[NUMBER_OF_SAMPLES];
-  int mZMode;
-};
-
-void RunTest( Application& application )
-{
-  ExampleController test( application );
-
-  application.MainLoop();
-}
-
-// Entry point for Linux & SLP applications
-//
-int DALI_EXPORT_API main( int argc, char **argv )
-{
-  Application application = Application::New( &argc, &argv );
-
-  RunTest( application );
-
-  return 0;
-}
diff --git a/examples/rendering-radial-progress/radial-progress.cpp b/examples/rendering-radial-progress/radial-progress.cpp
index 69d6e46f..75087ea3 100644
--- a/examples/rendering-radial-progress/radial-progress.cpp
+++ b/examples/rendering-radial-progress/radial-progress.cpp
@@ -127,6 +127,9 @@ public:
     Stage stage = Stage::GetCurrent();
     stage.SetBackgroundColor( Color::BLACK );
 
+    // Connect to the stage's key signal to allow Back and Escape to exit.
+    stage.KeyEventSignal().Connect( this, &RadialProgressController::OnKeyEvent );
+
     // 1. Create actor to show the effect
     mActor = Actor::New();
     mActor.SetAnchorPoint( AnchorPoint::CENTER );
@@ -283,6 +286,23 @@ public:
     return renderer;
   }
 
+  /**
+   * @brief Called when any key event is received
+   *
+   * Will use this to quit the application if Back or the Escape key is received
+   * @param[in] event The key event information
+   */
+  void OnKeyEvent( const KeyEvent& event )
+  {
+    if( event.state == KeyEvent::Down )
+    {
+      if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
+      {
+        mApplication.Quit();
+      }
+    }
+  }
+
 private:
 
   Application&  mApplication;
@@ -290,20 +310,11 @@ private:
   Actor mActor;
 };
 
-void RunTest( Application& application )
-{
-  RadialProgressController test( application );
-
-  application.MainLoop();
-}
-
 // Entry point for Linux & Tizen applications
-//
 int DALI_EXPORT_API main( int argc, char **argv )
 {
   Application application = Application::New( &argc, &argv );
-
-  RunTest( application );
-
+  RadialProgressController test( application );
+  application.MainLoop();
   return 0;
 }
diff --git a/resources/po/as.po b/resources/po/as.po
index 7fcdee27..54b478d2 100755
--- a/resources/po/as.po
+++ b/resources/po/as.po
@@ -67,18 +67,12 @@ msgstr "ছাঁয়া"
 msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
 msgstr "অঁকোৱা-পকোৱা"
 
-msgid "DALI_DEMO_STR_TITLE_LOGGING"
-msgstr "Logging"
-
 msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
 msgstr "পৰিবৰ্দ্ধক"
 
 msgid "DALI_DEMO_STR_TITLE_MESH_MORPH"
 msgstr "মেশ অঙ্কুৰিত"
 
-msgid "DALI_DEMO_STR_TITLE_MESH_SORTING"
-msgstr "মেশ অসংযোগ"
-
 msgid "DALI_DEMO_STR_TITLE_MESH_VISUAL"
 msgstr "3D অনুগামী"
 
diff --git a/resources/po/de.po b/resources/po/de.po
index 5c72910e..f0aad71e 100755
--- a/resources/po/de.po
+++ b/resources/po/de.po
@@ -67,18 +67,12 @@ msgstr "Licht und Schatten"
 msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
 msgstr "Linien"
 
-msgid "DALI_DEMO_STR_TITLE_LOGGING"
-msgstr "Logging"
-
 msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
 msgstr "Bildschirmlupe"
 
 msgid "DALI_DEMO_STR_TITLE_MESH_MORPH"
 msgstr "Mesh Veränderung"
 
-msgid "DALI_DEMO_STR_TITLE_MESH_SORTING"
-msgstr "Mesh Sortierung"
-
 msgid "DALI_DEMO_STR_TITLE_MESH_VISUAL"
 msgstr "3D-Modelle"
 
diff --git a/resources/po/en_GB.po b/resources/po/en_GB.po
index a864a772..5d30473b 100755
--- a/resources/po/en_GB.po
+++ b/resources/po/en_GB.po
@@ -73,18 +73,12 @@ msgstr "Lights and Shadows"
 msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
 msgstr "Mesh Line"
 
-msgid "DALI_DEMO_STR_TITLE_LOGGING"
-msgstr "Logging"
-
 msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
 msgstr "Magnifier"
 
 msgid "DALI_DEMO_STR_TITLE_MESH_MORPH"
 msgstr "Mesh Morph"
 
-msgid "DALI_DEMO_STR_TITLE_MESH_SORTING"
-msgstr "Mesh Sorting"
-
 msgid "DALI_DEMO_STR_TITLE_MESH_VISUAL"
 msgstr "Mesh Visual"
 
diff --git a/resources/po/en_US.po b/resources/po/en_US.po
index 4015058f..1296053f 100755
--- a/resources/po/en_US.po
+++ b/resources/po/en_US.po
@@ -76,18 +76,12 @@ msgstr "Lights and Shadows"
 msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
 msgstr "Mesh Line"
 
-msgid "DALI_DEMO_STR_TITLE_LOGGING"
-msgstr "Logging"
-
 msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
 msgstr "Magnifier"
 
 msgid "DALI_DEMO_STR_TITLE_MESH_MORPH"
 msgstr "Mesh Morph"
 
-msgid "DALI_DEMO_STR_TITLE_MESH_SORTING"
-msgstr "Mesh Sorting"
-
 msgid "DALI_DEMO_STR_TITLE_MESH_VISUAL"
 msgstr "Mesh Visual"
 
diff --git a/resources/po/es.po b/resources/po/es.po
index fb2da25c..4d5ae43f 100755
--- a/resources/po/es.po
+++ b/resources/po/es.po
@@ -67,18 +67,12 @@ msgstr "Luces y sombras"
 msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
 msgstr "Lineas"
 
-msgid "DALI_DEMO_STR_TITLE_LOGGING"
-msgstr "Control de entrada"
-
 msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
 msgstr "Lupa"
 
 msgid "DALI_DEMO_STR_TITLE_MESH_MORPH"
 msgstr "Transformacion de geometrias"
 
-msgid "DALI_DEMO_STR_TITLE_MESH_SORTING"
-msgstr "Ordenacion de geometrias"
-
 msgid "DALI_DEMO_STR_TITLE_MESH_VISUAL"
 msgstr "Gemeotria 3D"
 
diff --git a/resources/po/fi.po b/resources/po/fi.po
index 2742866d..b56ef252 100755
--- a/resources/po/fi.po
+++ b/resources/po/fi.po
@@ -67,18 +67,12 @@ msgstr "Valot ja Varjot"
 msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
 msgstr "Viivapolygoniverkko"
 
-msgid "DALI_DEMO_STR_TITLE_LOGGING"
-msgstr "Loggaus"
-
 msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
 msgstr "Suurennuslasi"
 
 msgid "DALI_DEMO_STR_TITLE_MESH_MORPH"
 msgstr "Polygoniverkon Muodonmuutos"
 
-msgid "DALI_DEMO_STR_TITLE_MESH_SORTING"
-msgstr "Polygoniverkon Lajittelu"
-
 msgid "DALI_DEMO_STR_TITLE_MESH_VISUAL"
 msgstr "Polygoniverkkovisuaali"
 
diff --git a/resources/po/ko.po b/resources/po/ko.po
index 2e3fe5c8..cece01b8 100755
--- a/resources/po/ko.po
+++ b/resources/po/ko.po
@@ -70,18 +70,12 @@ msgstr "빛과 그림자"
 msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
 msgstr "라인 메쉬"
 
-msgid "DALI_DEMO_STR_TITLE_LOGGING"
-msgstr "로깅"
-
 msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
 msgstr "돋보기"
 
 msgid "DALI_DEMO_STR_TITLE_MESH_MORPH"
 msgstr "메쉬 형태"
 
-msgid "DALI_DEMO_STR_TITLE_MESH_SORTING"
-msgstr "메쉬 분류"
-
 msgid "DALI_DEMO_STR_TITLE_MESH_VISUAL"
 msgstr "메쉬 비주얼"
 
diff --git a/resources/po/ml.po b/resources/po/ml.po
index 5b8dd41a..a1f7e838 100755
--- a/resources/po/ml.po
+++ b/resources/po/ml.po
@@ -67,18 +67,12 @@ msgstr "നിഴല്"
 msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
 msgstr "വര"
 
-msgid "DALI_DEMO_STR_TITLE_LOGGING"
-msgstr "ലോഗിംഗ്"
-
 msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
 msgstr "ഭൂതക്കണ്ണാടി"
 
 msgid "DALI_DEMO_STR_TITLE_MESH_MORPH"
 msgstr "മോർഫ് mesh"
 
-msgid "DALI_DEMO_STR_TITLE_MESH_SORTING"
-msgstr "തരംതിരിക്കലിനായി mesh"
-
 msgid "DALI_DEMO_STR_TITLE_MESH_VISUAL"
 msgstr "3D മോഡലിങ്"
 
diff --git a/resources/po/ur.po b/resources/po/ur.po
index aa864e5e..c3c76ad9 100755
--- a/resources/po/ur.po
+++ b/resources/po/ur.po
@@ -67,18 +67,12 @@ msgstr "روشنی اور سائے"
 msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
 msgstr "لکیریں"
 
-msgid "DALI_DEMO_STR_TITLE_LOGGING"
-msgstr "لاگنگ"
-
 msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
 msgstr "مکبر"
 
 msgid "DALI_DEMO_STR_TITLE_MESH_MORPH"
 msgstr "میش کی تبدیلی"
 
-msgid "DALI_DEMO_STR_TITLE_MESH_SORTING"
-msgstr "میش کی چھنٹائی"
-
 msgid "DALI_DEMO_STR_TITLE_MESH_VISUAL"
 msgstr "3D میش"
 
diff --git a/resources/po/zn_CH.po b/resources/po/zn_CH.po
index c889949e..f5aafe86 100755
--- a/resources/po/zn_CH.po
+++ b/resources/po/zn_CH.po
@@ -67,18 +67,12 @@ msgstr "阴影"
 msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
 msgstr "线条"
 
-msgid "DALI_DEMO_STR_TITLE_LOGGING"
-msgstr "记录"
-
 msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
 msgstr "放大鏡"
 
 msgid "DALI_DEMO_STR_TITLE_MESH_MORPH"
 msgstr "网格变形"
 
-msgid "DALI_DEMO_STR_TITLE_MESH_SORTING"
-msgstr "网格排序"
-
 msgid "DALI_DEMO_STR_TITLE_MESH_VISUAL"
 msgstr "3D模型"
 
diff --git a/shared/dali-demo-strings.h b/shared/dali-demo-strings.h
index 480c81cb..7ce01828 100644
--- a/shared/dali-demo-strings.h
+++ b/shared/dali-demo-strings.h
@@ -60,10 +60,8 @@ extern "C"
 #define DALI_DEMO_STR_TITLE_ITEM_VIEW                   dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_ITEM_VIEW")
 #define DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS          dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS")
 #define DALI_DEMO_STR_TITLE_LINE_MESH                   dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_LINE_MESH")
-#define DALI_DEMO_STR_TITLE_LOGGING                     dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_LOGGING")
 #define DALI_DEMO_STR_TITLE_MAGNIFIER                   dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_MAGNIFIER")
 #define DALI_DEMO_STR_TITLE_MESH_MORPH                  dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_MESH_MORPH")
-#define DALI_DEMO_STR_TITLE_MESH_SORTING                dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_MESH_SORTING")
 #define DALI_DEMO_STR_TITLE_MESH_VISUAL                 dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_MESH_VISUAL")
 #define DALI_DEMO_STR_TITLE_MOTION_BLUR                 dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_MOTION_BLUR")
 #define DALI_DEMO_STR_TITLE_MOTION_STRETCH              dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_MOTION_STRETCH")
@@ -132,10 +130,8 @@ extern "C"
 #define DALI_DEMO_STR_TITLE_ITEM_VIEW                   "Item View"
 #define DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS          "Lights and shadows"
 #define DALI_DEMO_STR_TITLE_LINE_MESH                   "Mesh Line"
-#define DALI_DEMO_STR_TITLE_LOGGING                     "Logging"
 #define DALI_DEMO_STR_TITLE_MAGNIFIER                   "Magnifier"
 #define DALI_DEMO_STR_TITLE_MESH_MORPH                  "Mesh Morph"
-#define DALI_DEMO_STR_TITLE_MESH_SORTING                "Mesh Sorting"
 #define DALI_DEMO_STR_TITLE_MESH_VISUAL                 "Mesh Visual"
 #define DALI_DEMO_STR_TITLE_MOTION_BLUR                 "Motion Blur"
 #define DALI_DEMO_STR_TITLE_MOTION_STRETCH              "Motion Stretch"