From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Thu, 6 Feb 2020 10:14:35 +0000 (+0000)
Subject: Merge "Read Pinch/Rotation environment variables when adaptor begin" into devel/master
X-Git-Tag: dali_1.5.0~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0f6f62fee6f28a43bac710900bc8d833299c4c24;hp=52e557c5feb9e623373844ec5ed5d7aab8a1536c;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

Merge "Read Pinch/Rotation environment variables when adaptor begin" into devel/master
---

diff --git a/dali/internal/system/common/environment-options.cpp b/dali/internal/system/common/environment-options.cpp
index 3827ad9..7fea428 100644
--- a/dali/internal/system/common/environment-options.cpp
+++ b/dali/internal/system/common/environment-options.cpp
@@ -540,6 +540,30 @@ void EnvironmentOptions::ParseEnvironmentOptions()
     mPinchMinimumDistance = pinchMinimumDistance;
   }
 
+  int pinchMinimumTouchEvents = -1;
+  if( GetIntegerEnvironmentVariable( DALI_ENV_PINCH_MINIMUM_TOUCH_EVENTS, pinchMinimumTouchEvents ) )
+  {
+    mPinchMinimumTouchEvents = pinchMinimumTouchEvents;
+  }
+
+  int pinchMinimumTouchEventsAfterStart = -1;
+  if( GetIntegerEnvironmentVariable( DALI_ENV_PINCH_MINIMUM_TOUCH_EVENTS_AFTER_START, pinchMinimumTouchEventsAfterStart ) )
+  {
+    mPinchMinimumTouchEventsAfterStart = pinchMinimumTouchEventsAfterStart;
+  }
+
+  int rotationMinimumTouchEvents = -1;
+  if( GetIntegerEnvironmentVariable( DALI_ENV_ROTATION_MINIMUM_TOUCH_EVENTS, rotationMinimumTouchEvents ) )
+  {
+    mRotationMinimumTouchEvents = rotationMinimumTouchEvents;
+  }
+
+  int rotationMinimumTouchEventsAfterStart = -1;
+  if( GetIntegerEnvironmentVariable( DALI_ENV_ROTATION_MINIMUM_TOUCH_EVENTS_AFTER_START, rotationMinimumTouchEventsAfterStart ) )
+  {
+    mRotationMinimumTouchEventsAfterStart = rotationMinimumTouchEventsAfterStart;
+  }
+
   int longPressMinimumHoldingTime = -1;
   if( GetIntegerEnvironmentVariable( DALI_ENV_LONG_PRESS_MINIMUM_HOLDING_TIME, longPressMinimumHoldingTime ) )
   {