From: Tom Robinson <tom.robinson@samsung.com>
Date: Mon, 17 Oct 2016 15:22:09 +0000 (+0100)
Subject: Merge branch 'devel/master' into devel/new_vr
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Fdevel%2Fnew_vr;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

Merge branch 'devel/master' into devel/new_vr

Change-Id: I39b149bd3deafdaaa1f002571fc087d7a2e7e83a
---

b37a2716ffcd268426ed530ddd2d45a78487df0a
diff --cc examples/mesh-visual/mesh-visual-example.cpp
index 9a12c0e,e8674c9..413eb2b
--- a/examples/mesh-visual/mesh-visual-example.cpp
+++ b/examples/mesh-visual/mesh-visual-example.cpp
@@@ -606,6 -561,6 +602,12 @@@ public
      //Update light to account for the change.
      SetLightMode();
  
++    //Change light image.
++    SetLightImage();
++
++    //Update light to account for the change.
++    SetLightMode();
++
      return true;
    }
  
diff --cc examples/tilt/tilt-example.cpp
index 02e4f68,230704a..2fb4a21
--- a/examples/tilt/tilt-example.cpp
+++ b/examples/tilt/tilt-example.cpp
@@@ -88,24 -88,24 +88,39 @@@ public
  
      mTextLabel.SetOrientation(Quaternion());
      mTextLabel.RotateBy(rollRot);
 -    mTextLabel.RotateBy(pitchRot);;
 +    mTextLabel.RotateBy(pitchRot);
 +  }
 +
 +  /**
 +   * @brief OnKeyEvent signal handler.
 +   * @param[in] event The key event information
 +   */
 +  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();
 +      }
 +    }
    }
  
+   /**
+    * @brief OnKeyEvent signal handler.
+    * @param[in] event The key event information
+    */
+   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;
    TiltSensor mTiltSensor;