Merge branch 'tizen_4.0' into tizen

Change-Id: Ibae752b267feae901c0312645fa33e0bdcdc97fd

diff --cc packaging/webapi-plugins.spec
index 21765e3,ec7c388..1e217f6
--- 1/packaging/webapi-plugins.spec
--- 2/packaging/webapi-plugins.spec
+++ b/packaging/webapi-plugins.spec
@@@ -8,7 -8,7 +8,7 @@@
  %define crosswalk_extensions_path %{_libdir}/%{crosswalk_extensions}
  
  Name:       webapi-plugins
- Version:    2.27
 -Version:    2.25
++Version:    2.28
  Release:    0
  License:    Apache-2.0 and BSD-3-Clause and MIT
  Group:      Development/Libraries

diff --cc src/humanactivitymonitor/humanactivitymonitor_api.js
index 7cc7dae,01da87c..a8ebf7b
--- 1/src/humanactivitymonitor/humanactivitymonitor_api.js
--- 2/src/humanactivitymonitor/humanactivitymonitor_api.js
+++ b/src/humanactivitymonitor/humanactivitymonitor_api.js
@@@ -350,7 -294,12 +348,12 @@@ HumanActivityMonitorManager.prototype.s
      {name: 'options', type : types_.DICTIONARY, optional : true, nullable : true}
    ]);
  
 -  var listenerId = 'HumanActivityMonitor_'  + args.type;
+   if (HumanActivityType.WRIST_UP === args.type) {
+     utils_.warn('DEPRECATION WARNING: HumanActivityType.WRIST_UP is deprecated since Tizen 4.0. '
+                      + 'Use GestureType and addGestureRecognitionListener to monitor WRIST_UP gesture');
+   }
+ 
 +  var listenerId = 'HumanActivityMonitor_' + args.type;
    var optionsAttributes = ["callbackInterval", "sampleInterval"], options = args.options || {};
  
    var callbackInterval = null, sampleInterval = null;