Add config values for scroller behavior

there are ambiguous config values for momentum animation
so that this patch tag them as deprecated and add new values

Change-Id: I450f0c803a12117c60a4a9f4d837ad6fbfa492ae
Signed-off-by: Wonki Kim <wonki_.kim@samsung.com>

diff --git a/config/common/base.src b/config/common/base.src
index 2ac5c58..a33c8d5 100644 (file)
--- a/config/common/base.src
+++ b/config/common/base.src
@@ -7,19 +7,24 @@ group "Elm_Config" struct {
   value "thumbscroll_threshold" int: 15;
   value "thumbscroll_hold_threshold" int: 100;
   value "thumbscroll_momentum_threshold" double: 100.0;
-  value "thumbscroll_flick_distance_tolerance" int: 3000;
-  value "thumbscroll_friction" double: 0.95;
-  value "thumbscroll_min_friction" double: 0.3;
-  value "thumbscroll_friction_standard" double: 3500.0;
   value "thumbscroll_bounce_friction" double: 0.5;
   value "thumbscroll_bounce_enable" uchar: 0;
   value "thumbscroll_acceleration_threshold" double: 2000.0;
   value "thumbscroll_acceleration_time_limit" double: 0.5;
   value "thumbscroll_acceleration_weight" double: 1.5;
   //
+  value "thumbscroll_momentum_distance_max" int: 3000;
+  value "thumbscroll_momentum_friction" double: 0.95;
   value "thumbscroll_momentum_animation_duration_min_limit" double: 0.25;
   value "thumbscroll_momentum_animation_duration_max_limit" double: 1.25;
   //
+
+  // Deprecated
+  value "thumbscroll_flick_distance_tolerance" int: 3000;
+  value "thumbscroll_friction" double: 0.95;
+  value "thumbscroll_min_friction" double: 0.3;
+  value "thumbscroll_friction_standard" double: 3500.0;
+  //
   value "page_scroll_friction" double: 0.2;
   value "bring_in_scroll_friction" double: 0.3;
   value "zoom_friction" double: 0.5;

diff --git a/config/ivi/base.src b/config/ivi/base.src
index 8b69fb9..6b4fad8 100644 (file)
--- a/config/ivi/base.src
+++ b/config/ivi/base.src
@@ -7,19 +7,24 @@ group "Elm_Config" struct {
   value "thumbscroll_threshold" int: 15;
   value "thumbscroll_hold_threshold" int: 100;
   value "thumbscroll_momentum_threshold" double: 100.0;
-  value "thumbscroll_flick_distance_tolerance" int: 3000;
-  value "thumbscroll_friction" double: 0.95;
-  value "thumbscroll_min_friction" double: 0.3;
-  value "thumbscroll_friction_standard" double: 3500.0;
   value "thumbscroll_bounce_friction" double: 0.5;
   value "thumbscroll_bounce_enable" uchar: 0;
   value "thumbscroll_acceleration_threshold" double: 2000.0;
   value "thumbscroll_acceleration_time_limit" double: 0.5;
   value "thumbscroll_acceleration_weight" double: 1.5;
   //
+  value "thumbscroll_momentum_distance_max" int: 3000;
+  value "thumbscroll_momentum_friction" double: 0.95;
   value "thumbscroll_momentum_animation_duration_min_limit" double: 0.25;
   value "thumbscroll_momentum_animation_duration_max_limit" double: 1.25;
   //
+
+  // Deprecated
+  value "thumbscroll_flick_distance_tolerance" int: 3000;
+  value "thumbscroll_friction" double: 0.95;
+  value "thumbscroll_min_friction" double: 0.3;
+  value "thumbscroll_friction_standard" double: 3500.0;
+  //
   value "page_scroll_friction" double: 0.2;
   value "bring_in_scroll_friction" double: 0.3;
   value "zoom_friction" double: 0.5;

diff --git a/config/mobile/base.src b/config/mobile/base.src
index 861bf58..6d03e96 100644 (file)
--- a/config/mobile/base.src
+++ b/config/mobile/base.src
@@ -6,19 +6,24 @@ group "Elm_Config" struct {
   value "thumbscroll_enable" uchar: 1;
   value "thumbscroll_threshold" int: 15;
   value "thumbscroll_hold_threshold" int: 100;
-  value "thumbscroll_momentum_threshold" double: 100.0;
-  value "thumbscroll_flick_distance_tolerance" int: 3000;
-  value "thumbscroll_friction" double: 0.95;
-  value "thumbscroll_min_friction" double: 0.3;
-  value "thumbscroll_friction_standard" double: 3500.0;
   value "thumbscroll_bounce_friction" double: 0.5;
   value "thumbscroll_bounce_enable" uchar: 0;
   value "thumbscroll_acceleration_threshold" double: 2000.0;
   value "thumbscroll_acceleration_time_limit" double: 0.5;
   value "thumbscroll_acceleration_weight" double: 1.5;
   //
-  value "thumbscroll_momentum_animation_duration_min_limit" double: 0.25;
-  value "thumbscroll_momentum_animation_duration_max_limit" double: 1.25;
+  value "thumbscroll_momentum_threshold" double: 100.0;
+  value "thumbscroll_momentum_distance_max" int: 5000;
+  value "thumbscroll_momentum_friction" double: 0.95;
+  value "thumbscroll_momentum_animation_duration_min_limit" double: 0.3;
+  value "thumbscroll_momentum_animation_duration_max_limit" double: 1.3;
+  //
+
+  // Deprecated
+  value "thumbscroll_flick_distance_tolerance" int: 3000;
+  value "thumbscroll_friction" double: 0.95;
+  value "thumbscroll_min_friction" double: 0.3;
+  value "thumbscroll_friction_standard" double: 3500.0;
   //
   value "page_scroll_friction" double: 0.2;
   value "bring_in_scroll_friction" double: 0.3;

diff --git a/config/tv/base.src b/config/tv/base.src
index 241b0a9..b2a813c 100644 (file)
--- a/config/tv/base.src
+++ b/config/tv/base.src
@@ -7,19 +7,24 @@ group "Elm_Config" struct {
   value "thumbscroll_threshold" int: 15;
   value "thumbscroll_hold_threshold" int: 100;
   value "thumbscroll_momentum_threshold" double: 100.0;
-  value "thumbscroll_flick_distance_tolerance" int: 3000;
-  value "thumbscroll_friction" double: 0.95;
-  value "thumbscroll_min_friction" double: 0.3;
-  value "thumbscroll_friction_standard" double: 3500.0;
   value "thumbscroll_bounce_friction" double: 0.5;
   value "thumbscroll_bounce_enable" uchar: 0;
   value "thumbscroll_acceleration_threshold" double: 2000.0;
   value "thumbscroll_acceleration_time_limit" double: 0.5;
   value "thumbscroll_acceleration_weight" double: 1.5;
   //
+  value "thumbscroll_momentum_distance_max" int: 3000;
+  value "thumbscroll_momentum_friction" double: 0.95;
   value "thumbscroll_momentum_animation_duration_min_limit" double: 0.25;
   value "thumbscroll_momentum_animation_duration_max_limit" double: 1.25;
   //
+
+  // Deprecated
+  value "thumbscroll_flick_distance_tolerance" int: 3000;
+  value "thumbscroll_friction" double: 0.95;
+  value "thumbscroll_min_friction" double: 0.3;
+  value "thumbscroll_friction_standard" double: 3500.0;
+  //
   value "page_scroll_friction" double: 0.2;
   value "bring_in_scroll_friction" double: 0.3;
   value "zoom_friction" double: 0.5;

diff --git a/config/wearable/base.src b/config/wearable/base.src
index abcf6a1..a4042f9 100644 (file)
--- a/config/wearable/base.src
+++ b/config/wearable/base.src
@@ -7,19 +7,24 @@ group "Elm_Config" struct {
   value "thumbscroll_threshold" int: 30;
   value "thumbscroll_hold_threshold" int: 100;
   value "thumbscroll_momentum_threshold" double: 100.0;
-  value "thumbscroll_flick_distance_tolerance" int: 3000;
-  value "thumbscroll_friction" double: 0.95;
-  value "thumbscroll_min_friction" double: 0.3;
-  value "thumbscroll_friction_standard" double: 3500.0;
   value "thumbscroll_bounce_friction" double: 0.5;
   value "thumbscroll_bounce_enable" uchar: 0;
   value "thumbscroll_acceleration_threshold" double: 2000.0;
   value "thumbscroll_acceleration_time_limit" double: 0.5;
   value "thumbscroll_acceleration_weight" double: 1.5;
   //
+  value "thumbscroll_momentum_distance_max" int: 3000;
+  value "thumbscroll_momentum_friction" double: 0.95;
   value "thumbscroll_momentum_animation_duration_min_limit" double: 0.25;
   value "thumbscroll_momentum_animation_duration_max_limit" double: 1.25;
   //
+
+  // Deprecated
+  value "thumbscroll_flick_distance_tolerance" int: 3000;
+  value "thumbscroll_friction" double: 0.95;
+  value "thumbscroll_min_friction" double: 0.3;
+  value "thumbscroll_friction_standard" double: 3500.0;
+  //
   value "page_scroll_friction" double: 0.2;
   value "bring_in_scroll_friction" double: 0.2;
   value "zoom_friction" double: 0.5;