[dali_1.2.61] Merge branch 'devel/master'

Change-Id: I160a9cde85c40723834dea23fdf0288a672c629c

[dali_1.2.61] Merge branch 'devel/master'
Change-Id: I160a9cde85c40723834dea23fdf0288a672c629c
greynaga
2 parents 8b8df4bd ec2a7635
Showing 86 changed files with 190 additions and 1815 deletions
builder/dali-builder.cpp
com.samsung.dali-demo.xml
examples-reel/dali-examples-reel.cpp
examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp
examples/animated-images/animated-images-example.cpp
examples/animated-shapes/animated-shapes-example.cpp
examples/benchmark/benchmark.cpp
examples/blocks/blocks-example.cpp
examples/bubble-effect/bubble-effect-example.cpp
examples/buttons/buttons-example.cpp
examples/clipping-draw-order/clipping-draw-order.cpp
examples/compressed-texture-formats/compressed-texture-formats-example.cpp
examples/cube-transition-effect/cube-transition-effect-example.cpp
examples/dissolve-effect/dissolve-effect-example.cpp
examples/effects-view/effects-view-example.cpp
examples/flex-container/flex-container-example.cpp
examples/focus-integration/focus-integration.cpp
examples/fpp-game/fpp-game-example.cpp
examples/gradients/gradients-example.cpp
examples/hello-world/hello-world-example.cpp
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * 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.
@@ -295,7 +295,7 @@ private:
 //
 //
 //------------------------------------------------------------------------------
-int main(int argc, char **argv)
+int DALI_EXPORT_API main(int argc, char **argv)
 {
  
   Application dali_app = Application::New(&argc, &argv, DEMO_THEME_PATH);
@@ -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>
@@ -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));
@@ -150,20 +150,10 @@ private:
   int mImageCombinationIndex;
 };
  
-void RunTest( Application& application )
-{
-  ImageViewAlphaBlendApp 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 );
-
+  ImageViewAlphaBlendApp test( application );
+  application.MainLoop();
   return 0;
 }
@@ -376,7 +376,6 @@ private:
   ImageType mImageType;
 };
  
-// Entry point for Linux & Tizen applications
 //
 int DALI_EXPORT_API main( int argc, char **argv )
 {
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * 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.
@@ -460,16 +460,10 @@ private:
  
 };
  
-void RunTest( Application& application )
+int DALI_EXPORT_API main( int argc, char **argv )
 {
+  Application application = Application::New( &argc, &argv );
   AnimatedShapesExample test( application );
   application.MainLoop();
-}
-
-int main( int argc, char **argv )
-{
-  Application application = Application::New( &argc, &argv );
-  RunTest( application );
-
   return 0;
 }
@@ -464,15 +464,6 @@ private:
   Animation           mHide;
 };
  
-void RunTest( Application& application )
-{
-  Benchmark 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 );
@@ -502,7 +493,8 @@ int DALI_EXPORT_API main( int argc, char **argv )
     }
   }
  
-  RunTest( application );
+  Benchmark test( application );
+  application.MainLoop();
  
   return 0;
 }
@@ -862,18 +862,10 @@ private:
   int mBrickCount;                                      ///< Total bricks on screen.
 };
  
-void RunTest(Application& app)
-{
-  ExampleController test(app);
-
-  app.MainLoop();
-}
-
 int DALI_EXPORT_API main(int argc, char **argv)
 {
   Application app = Application::New(&argc, &argv, DEMO_THEME_PATH);
-
-  RunTest(app);
-
+  ExampleController test(app);
+  app.MainLoop();
   return 0;
 }
@@ -306,20 +306,10 @@ private:
  
 /*****************************************************************************/
  
-static void
-RunTest(Application& app)
-{
-  BubbleEffectExample theApp(app);
-  app.MainLoop();
-}
-
-/*****************************************************************************/
-
 int DALI_EXPORT_API main(int argc, char **argv)
 {
   Application app = Application::New(&argc, &argv, DEMO_THEME_PATH);
-
-  RunTest(app);
-
+  BubbleEffectExample theApp(app);
+  app.MainLoop();
   return 0;
 }
@@ -509,20 +509,10 @@ private:
   Toolkit::ImageView mImage;
 };
  
-void RunTest( Application& application )
-{
-  ButtonsController 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 );
-
+  ButtonsController test( application );
+  application.MainLoop();
   return 0;
 }
@@ -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,31 @@ 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;
 }
@@ -202,20 +202,10 @@ private:
   Application&  mApplication;
 };
  
-void RunTest( Application& application )
-{
-  CompressedTextureFormatsController 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 );
-
+  CompressedTextureFormatsController test( application );
+  application.MainLoop();
   return 0;
 }
@@ -413,7 +413,6 @@ void CubeTransitionApp::OnKeyEvent(const KeyEvent&amp; event)
   }
 }
  
-// Entry point for Linux & Tizen applications
 int DALI_EXPORT_API main( int argc, char **argv )
 {
   Application application = Application::New( &argc, &argv, DEMO_THEME_PATH );
@@ -436,7 +436,6 @@ bool DissolveEffectApp::OnTimerTick()
   return false;   //return false to stop the timer
 }
  
-// Entry point for Linux & Tizen applications
 int DALI_EXPORT_API main( int argc, char **argv )
 {
   Application application = Application::New( &argc, &argv, DEMO_THEME_PATH );
@@ -245,20 +245,10 @@ void EffectsViewApp::OnKeyEvent(const KeyEvent&amp; event)
  
 /*****************************************************************************/
  
-static void RunTest( Application& application )
-{
-  EffectsViewApp test( application );
-
-  application.MainLoop();
-}
-
-/*****************************************************************************/
-
 int DALI_EXPORT_API main(int argc, char **argv)
 {
   Application application = Application::New(&argc, &argv, DEMO_THEME_PATH);
-
-  RunTest(application);
-
+  EffectsViewApp test( application );
+  application.MainLoop();
   return 0;
 }
@@ -367,18 +367,10 @@ private:
   Toolkit::PushButton mAlignContentButton;
 };
  
-void RunTest(Application& app)
-{
-  FlexContainerExample test(app);
-
-  app.MainLoop();
-}
-
 int DALI_EXPORT_API main(int argc, char **argv)
 {
   Application app = Application::New(&argc, &argv, DEMO_THEME_PATH);
-
-  RunTest(app);
-
+  FlexContainerExample test(app);
+  app.MainLoop();
   return 0;
 }
@@ -193,7 +193,6 @@ private:
   Layer             mContentLayer;                      ///< Content layer.
 };
  
-// Entry point for Linux & Tizen applications
 //
 int DALI_EXPORT_API main( int argc, char **argv )
 {
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * 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.
@@ -135,20 +135,10 @@ private:
   FppGameTutorialController mTutorialController;
 };
  
-void RunTest( Application& application )
-{
-  GameController 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 );
-
+  GameController test( application );
+  application.MainLoop();
   return 0;
 }
@@ -161,20 +161,10 @@ private:
   unsigned mIndex;
 };
  
-void RunTest( Application& application )
-{
-  GradientController 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 );
-
+  GradientController test( application );
+  application.MainLoop();
   return 0;
 }
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * 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.
@@ -65,20 +65,10 @@ private:
   Application&  mApplication;
 };
  
-void RunTest( Application& application )
-{
-  HelloWorldController 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 );
-
+  HelloWorldController test( application );
+  application.MainLoop();
   return 0;
 }
@@ -454,26 +454,6 @@ private:
   int                         mCurrentPage;
 };
  
-void RunTest( Application& application, const HomescreenBenchmark::Config& config, bool printHelpAndExit )
-{
-  HomescreenBenchmark test( application, config );
-
-  if( printHelpAndExit )
-  {
-    PrintHelp( "c<num>",               " Number of columns" );
-    PrintHelp( "r<num>",               " Number of rows" );
-    PrintHelp( "p<num>",               " Number of pages ( must be greater than 1 )" );
-    PrintHelp( "-disable-tableview",   " Disables the use of TableView for layouting" );
-    PrintHelp( "-disable-icon-labels", " Disables labels for each icon" );
-    PrintHelp( "-use-checkbox",        " Uses checkboxes for icons" );
-    PrintHelp( "-use-text-label",      " Uses TextLabel instead of a TextVisual" );
-    return;
-  }
-
-  application.MainLoop();
-}
-
-// Entry point for Linux & Tizen applications.
 int DALI_EXPORT_API main( int argc, char **argv )
 {
   // Default settings.
@@ -519,8 +499,21 @@ int DALI_EXPORT_API main( int argc, char **argv )
   }
  
   Application application = Application::New( &argc, &argv );
+  HomescreenBenchmark test( application, config );
  
-  RunTest( application, config, printHelpAndExit );
+  if( printHelpAndExit )
+  {
+    PrintHelp( "c<num>",               " Number of columns" );
+    PrintHelp( "r<num>",               " Number of rows" );
+    PrintHelp( "p<num>",               " Number of pages ( must be greater than 1 )" );
+    PrintHelp( "-disable-tableview",   " Disables the use of TableView for layouting" );
+    PrintHelp( "-disable-icon-labels", " Disables labels for each icon" );
+    PrintHelp( "-use-checkbox",        " Uses checkboxes for icons" );
+    PrintHelp( "-use-text-label",      " Uses TextLabel instead of a TextVisual" );
+    return 0;
+  }
+
+  application.MainLoop();
  
   return 0;
 }
@@ -723,19 +723,10 @@ private:
  
 };
  
-void RunTest( Application& application )
-{
-  ImageScalingAndFilteringController 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 );
-
+  ImageScalingAndFilteringController test( application );
+  application.MainLoop();
   return 0;
 }
@@ -644,19 +644,10 @@ private:
   unsigned int mImagesLoaded;         ///< How many images have been loaded
 };
  
-void RunTest( Application& application )
-{
-  ImageScalingIrregularGridController 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 );
-
+  ImageScalingIrregularGridController test( application );
+  application.MainLoop();
   return 0;
 }
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * 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.
@@ -117,20 +117,10 @@ private:
   unsigned int mIndex;
 };
  
-void RunTest( Application& application )
-{
-  ImageViewAlphaBlendApp 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 );
-
+  ImageViewAlphaBlendApp test( application );
+  application.MainLoop();
   return 0;
 }
@@ -234,20 +234,10 @@ private:
   unsigned int mIndex;
 };
  
-void RunTest( Application& application )
-{
-  ImageViewPixelAreaApp 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 );
-
+  ImageViewPixelAreaApp test( application );
+  application.MainLoop();
   return 0;
 }
@@ -232,20 +232,10 @@ private:
   unsigned int        mIndex;
 };
  
-void RunTest( Application& application )
-{
-  ImageSvgController 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 );
-
+  ImageSvgController test( application );
+  application.MainLoop();
   return 0;
 }
@@ -198,20 +198,10 @@ private:
   Texture mOutputTexture;
 };
  
-void RunTest( Application& application )
-{
-  ImageViewUrlApp 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 );
-
+  ImageViewUrlApp test( application );
+  application.MainLoop();
   return 0;
 }
@@ -226,20 +226,10 @@ private:
  
 };
  
-void RunTest( Application& application )
-{
-  ImageViewController 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 );
-
+  ImageViewController test( application );
+  application.MainLoop();
   return 0;
 }
@@ -994,18 +994,10 @@ private:
   LongPressGestureDetector mLongPressDetector;
 };
  
-void RunTest(Application& app)
-{
-  ItemViewExample test(app);
-
-  app.MainLoop();
-}
-
 int DALI_EXPORT_API main(int argc, char **argv)
 {
   Application app = Application::New(&argc, &argv, DEMO_THEME_PATH);
-
-  RunTest(app);
-
+  ItemViewExample test(app);
+  app.MainLoop();
   return 0;
 }
@@ -391,20 +391,10 @@ private:
   int      mMaxIndexCount;
 };
  
-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 );
-
+  ExampleController test( application );
+  application.MainLoop();
   return 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;
-}
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * 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.
@@ -402,20 +402,10 @@ private:
  
 };
  
-void RunTest( Application& application )
-{
-  ExampleController 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 );
-
+  ExampleController test( application );
+  application.MainLoop();
   return 0;
 }
@@ -348,20 +348,10 @@ private:
   Timer    mMorphTimer;
 };
  
-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 );
-
+  ExampleController test( application );
+  application.MainLoop();
   return 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;
-}
@@ -603,9 +603,7 @@ private:
   bool mLightFront; //Bool for light being in front or behind the models.
 };
  
-// Entry point for Linux & Tizen applications
-//
-int main( int argc, char **argv )
+int DALI_EXPORT_API main( int argc, char **argv )
 {
   Application application = Application::New( &argc, &argv );
   MeshVisualController test( application );
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * 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.
@@ -294,20 +294,10 @@ private:
   bool mScaled;
 };
  
-void RunTest( Application& application )
-{
-  Model3dViewController 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 );
-
+  Model3dViewController test( application );
+  application.MainLoop();
   return 0;
 }
@@ -451,20 +451,10 @@ private:
   Animation mRotateAnimation;                   ///< Animation for rotating between landscape and portrait.
 };
  
-void RunTest(Application& app)
-{
-  MotionBlurExampleApp test(app);
-
-  app.MainLoop();
-}
-
-// Entry point for Linux & Tizen applications
-//
 int DALI_EXPORT_API main(int argc, char **argv)
 {
   Application app = Application::New(&argc, &argv, DEMO_THEME_PATH);
-
-  RunTest(app);
-
+  MotionBlurExampleApp test(app);
+  app.MainLoop();
   return 0;
 }
@@ -427,20 +427,10 @@ private:
  
 };
  
-void RunTest(Application& app)
-{
-  MotionStretchExampleApp test(app);
-
-  app.MainLoop();
-}
-
-// Entry point for Linux & Tizen applications
-//
 int DALI_EXPORT_API main(int argc, char **argv)
 {
   Application app = Application::New(&argc, &argv, DEMO_THEME_PATH);
-
-  RunTest(app);
-
+  MotionStretchExampleApp test(app);
+  app.MainLoop();
   return 0;
 }
@@ -432,20 +432,10 @@ private:
   bool mRefreshAlways;
 };
  
-void RunTest( Application& application )
-{
-  NativeImageSourceController 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 );
-
+  NativeImageSourceController test( application );
+  application.MainLoop();
   return 0;
 }
@@ -451,15 +451,6 @@ private:
   Animation           mHide;
 };
  
-void RunTest( Application& application )
-{
-  PerfScroll 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 );
@@ -481,7 +472,8 @@ int DALI_EXPORT_API main( int argc, char **argv )
     }
   }
  
-  RunTest( application );
+  PerfScroll test( application );
+  application.MainLoop();
  
   return 0;
 }
@@ -227,20 +227,10 @@ private:
   Timer    mChangeImageTimer;
 };
  
-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 );
-
+  ExampleController test( application );
+  application.MainLoop();
   return 0;
 }
@@ -732,19 +732,10 @@ private:
  
 };
  
-void RunTest( Application& application )
-{
-  PopupExample 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, DEMO_THEME_PATH );
-
-  RunTest( application );
-
+  PopupExample test( application );
+  application.MainLoop();
   return 0;
 }
@@ -706,20 +706,10 @@ private:
   Vector2                   mRotation;              ///< Keeps track of model rotation.
 };
  
-void RunTest( Application& application )
+int DALI_EXPORT_API main( int argc, char **argv )
 {
+  Application application = Application::New( &argc, &argv );
   PrimitiveShapesController test( application );
-
   application.MainLoop();
-}
-
-// Entry point for Linux & Tizen applications
-//
-int main( int argc, char **argv )
-{
-  Application application = Application::New( &argc, &argv );
-
-  RunTest( application );
-
   return 0;
 }
@@ -211,20 +211,10 @@ private:
   ToolBar mToolBar;
 };
  
-void RunTest( Application& application )
-{
-  RayMarchingExample 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 );
-
+  RayMarchingExample test( application );
+  application.MainLoop();
   return 0;
 }
@@ -588,20 +588,10 @@ private:
  
 /*****************************************************************************/
  
-static void
-RunTest(Application& app)
-{
-  RefractionEffectExample theApp(app);
-  app.MainLoop();
-}
-
-/*****************************************************************************/
-
 int DALI_EXPORT_API main(int argc, char **argv)
 {
   Application app = Application::New(&argc, &argv, DEMO_THEME_PATH);
-
-  RunTest(app);
-
+  RefractionEffectExample theApp(app);
+  app.MainLoop();
   return 0;
 }
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * 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.
@@ -208,18 +208,10 @@ private:
  
 };
  
-void RunTest(Application &application)
-{
-  MyTester 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);
-
+  MyTester test(application);
+  application.MainLoop();
   return 0;
 }
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * 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.
@@ -753,29 +753,10 @@ private:
   Actor            mCubes[2];          ///< The cube object containers
 };
  
-
-/**
- * @brief Creates an instance of the example object and runs it.
- * @param[in] application The DALi application object
- */
-void RunExample( Application& application )
-{
-  RendererStencilExample example( application );
-
-  application.MainLoop();
-}
-
-/**
- * @brief Entry point for Linux & Tizen applications
- * @param[in] argc The executables argument count
- * @param[in] argv The executables argument vector
- * @return The executables exit code (0)
- */
 int DALI_EXPORT_API main( int argc, char **argv )
 {
   Application application = Application::New( &argc, &argv );
-
-  RunExample( application );
-
+  RendererStencilExample example( application );
+  application.MainLoop();
   return 0;
 }
@@ -409,20 +409,10 @@ private:
   Animation mAnimation;
 };
  
-void RunTest( Application& application )
-{
-  BasicLightController 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, BASIC_LIGHT_THEME);
-
-  RunTest( application );
-
+  BasicLightController test( application );
+  application.MainLoop();
   return 0;
 }
@@ -451,20 +451,10 @@ private:
  
 };
  
-void RunTest( Application& application )
-{
-  BasicPbrController 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 );
-
+  BasicPbrController test( application );
+  application.MainLoop();
   return 0;
 }
@@ -278,20 +278,10 @@ private:
   Animation mAnimation;
 };
  
-void RunTest( Application& application )
-{
-  DrawCubeController 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 );
-
+  DrawCubeController test( application );
+  application.MainLoop();
   return 0;
 }
@@ -186,20 +186,10 @@ private:
   Actor mActor;
 };
  
-void RunTest( Application& application )
-{
-  DrawLineController 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 );
-
+  DrawLineController test( application );
+  application.MainLoop();
   return 0;
 }
@@ -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,10 @@ 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;
 }
@@ -484,20 +484,10 @@ private:
   Actor mSkyboxActor;
 };
  
-void RunTest( Application& application )
-{
-  TexturedCubeController 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 );
-
+  TexturedCubeController test( application );
+  application.MainLoop();
   return 0;
 }
@@ -297,20 +297,10 @@ private:
   Animation mAnimation;
 };
  
-void RunTest( Application& application )
-{
-  TexturedCubeController 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 );
-
+  TexturedCubeController test( application );
+  application.MainLoop();
   return 0;
 }
@@ -187,20 +187,10 @@ private:
   Actor mActor;
 };
  
-void RunTest( Application& application )
-{
-  DrawTriangleController 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 );
-
+  DrawTriangleController test( application );
+  application.MainLoop();
   return 0;
 }
@@ -511,20 +511,10 @@ private:
  
 /*****************************************************************************/
  
-static void
-RunTest(Application& app)
-{
-  TestApp theApp(app);
-  app.MainLoop();
-}
-
-/*****************************************************************************/
-
 int DALI_EXPORT_API main(int argc, char **argv)
 {
   Application app = Application::New(&argc, &argv, DEMO_THEME_PATH);
-
-  RunTest(app);
-
+  TestApp theApp(app);
+  app.MainLoop();
   return 0;
 }
@@ -31,7 +31,6 @@ namespace
 const char* SIMPLE_DEMO_THEME( DEMO_STYLE_DIR "simple-example-theme.json" );
 }
  
-/// Entry point for applications
 int DALI_EXPORT_API main( int argc, char** argv )
 {
   Application application = Application::New( &argc, &argv, SIMPLE_DEMO_THEME ); // Use the above defined style sheet for this application.
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * 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.
@@ -819,19 +819,10 @@ private:
  
 };
  
-void RunTest( Application& application )
-{
-  SizeNegotiationController 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, DEMO_THEME_PATH );
-
-  RunTest( application );
-
+  SizeNegotiationController test( application );
+  application.MainLoop();
   return 0;
 }
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * 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.
@@ -548,21 +548,11 @@ private:
   std::map< Animation, int > mTapAnimationIndexPair;
 };
  
-void RunTest( Application& application )
-{
-  SparkleEffectExample theApp( 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 );
-
+  SparkleEffectExample theApp( application );
+  application.MainLoop();
   return 0;
 }
  
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * 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.
@@ -26,7 +26,6 @@
 #include "styling-application.h"
  
  
-/// Entry point for applications
 int DALI_EXPORT_API main( int argc, char** argv )
 {
   const char* themeName = Demo::StylingApplication::DEMO_THEME_ONE_PATH;
@@ -295,20 +295,11 @@ private:
   Toolkit::TableView  mButtonContainer;
 };
  
-void RunTest( Application& application )
-{
-  TextEditorExample test( application );
-
-  application.MainLoop();
-}
-
-/** Entry point for Linux & Tizen applications */
-int main( int argc, char **argv )
+int DALI_EXPORT_API main( int argc, char **argv )
 {
   // DALI_DEMO_THEME_PATH not passed to Application so TextEditor example uses default Toolkit style sheet.
   Application application = Application::New( &argc, &argv );
-
-  RunTest( application );
-
+  TextEditorExample test( application );
+  application.MainLoop();
   return 0;
 }
@@ -211,20 +211,11 @@ private:
   Popup mPopup;
 };
  
-void RunTest( Application& application )
-{
-  TextFieldExample test( application );
-
-  application.MainLoop();
-}
-
-/** Entry point for Linux & Tizen applications */
 int DALI_EXPORT_API main( int argc, char **argv )
 {
   // DALI_DEMO_THEME_PATH not passed to Application so TextField example uses default Toolkit style sheet.
   Application application = Application::New( &argc, &argv );
-
-  RunTest( application );
-
+  TextFieldExample test( application );
+  application.MainLoop();
   return 0;
 }
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * 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.
@@ -245,19 +245,10 @@ private:
   bool mToggle;
 };
  
-void RunTest( Application& application )
-{
-  TextFontsExample 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 );
-
+  TextFontsExample test( application );
+  application.MainLoop();
   return 0;
 }
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * 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.
@@ -132,20 +132,10 @@ private:
   float          mLastPoint;
 };
  
-void RunTest( Application& application )
-{
-  EmojiExample 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, DEMO_THEME_PATH );
-
-  RunTest( application );
-
+  EmojiExample test( application );
+  application.MainLoop();
   return 0;
 }
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * 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.
@@ -134,19 +134,10 @@ private:
   float          mLastPoint;
 };
  
-void RunTest( Application& application )
-{
-  TextLabelMultiLanguageExample 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 );
-
+  TextLabelMultiLanguageExample test( application );
+  application.MainLoop();
   return 0;
 }
@@ -582,19 +582,10 @@ private:
   Property::Index mOverrideMixColorIndex;
 };
  
-void RunTest( Application& application )
-{
-  TextLabelExample 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 );
-
+  TextLabelExample test( application );
+  application.MainLoop();
   return 0;
 }
@@ -419,18 +419,10 @@ private:
   unsigned int mCurrentTextStyle;
 };
  
-void RunTest( Application& application )
-{
-  TextMemoryProfilingExample 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 );
-
+  TextMemoryProfilingExample test( application );
+  application.MainLoop();
   return 0;
 }
@@ -137,8 +137,7 @@ void TextOverlapController::OnKeyEvent( const KeyEvent&amp; keyEvent )
  
 } // namespace Demo
  
-
-int main( int argc, char** argv )
+int DALI_EXPORT_API main( int argc, char** argv )
 {
   {
     Application app = Application::New( &argc, &argv );
@@ -404,19 +404,10 @@ private:
   bool mToggleColor;
 };
  
-void RunTest( Application& application )
-{
-  TextScrollingExample 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 );
-
+  TextScrollingExample test( application );
+  application.MainLoop();
   return 0;
 }
@@ -241,20 +241,10 @@ private:
   Timer    mChangeImageTimer;
 };
  
-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 );
-
+  ExampleController test( application );
+  application.MainLoop();
   return 0;
 }
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * 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.
@@ -112,8 +112,6 @@ private:
   TextLabel mTextLabel;
 };
  
-// Entry point for Linux & Tizen applications
-//
 int DALI_EXPORT_API main( int argc, char **argv )
 {
   Application application = Application::New( &argc, &argv );
@@ -26,7 +26,6 @@
 #include "transition-application.h"
  
  
-/// Entry point for applications
 int DALI_EXPORT_API main( int argc, char** argv )
 {
   const char* themeName = Demo::TransitionApplication::DEMO_THEME_ONE_PATH;
@@ -352,20 +352,10 @@ private:
   Property::Map mNativeImageTarget;
 };
  
-void RunTest( Application& application )
-{
-  VideoViewController 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 );
-
+  VideoViewController test( application );
+  application.MainLoop();
   return 0;
 }
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * 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.
@@ -26,7 +26,6 @@
 #include "transition-application.h"
  
  
-/// Entry point for applications
 int DALI_EXPORT_API main( int argc, char** argv )
 {
   const char* themeName = Demo::TransitionApplication::DEMO_THEME_ONE_PATH;
@@ -2,7 +2,7 @@
  
 Name:       com.samsung.dali-demo
 Summary:    The OpenGLES Canvas Core Demo
-Version:    1.2.60
+Version:    1.2.61
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0
@@ -67,18 +67,12 @@ msgstr &quot;ছাঁয়া&quot;
 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 অনুগামী"
  
@@ -67,18 +67,12 @@ msgstr &quot;Licht und Schatten&quot;
 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"
  
@@ -73,18 +73,12 @@ msgstr &quot;Lights and Shadows&quot;
 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"
  
@@ -76,18 +76,12 @@ msgstr &quot;Lights and Shadows&quot;
 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"
  
@@ -67,18 +67,12 @@ msgstr &quot;Luces y sombras&quot;
 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"
  
@@ -67,18 +67,12 @@ msgstr &quot;Valot ja Varjot&quot;
 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"
  
@@ -70,18 +70,12 @@ msgstr &quot;빛과 그림자&quot;
 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 "메쉬 비주얼"
  
@@ -67,18 +67,12 @@ msgstr &quot;നിഴല്&quot;
 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 മോഡലിങ്"
  
@@ -67,18 +67,12 @@ msgstr &quot;روشنی اور سائے&quot;
 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 میش"
  
@@ -67,18 +67,12 @@ msgstr &quot;阴影&quot;
 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模型"
  
@@ -60,10 +60,8 @@ extern &quot;C&quot;
 #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 &quot;C&quot;
 #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"