Merge with upstream r66368

[framework/uifw/elementary.git] / config / slp / base.src

diff --git a/config/slp/base.src b/config/slp/base.src
index dfbbabb..91708c3 100644 (file)
--- a/config/slp/base.src
+++ b/config/slp/base.src
@@ -7,11 +7,12 @@ group "Elm_Config" struct {
   value "thumbscroll_momentum_threshold" double: 100.0;
   value "thumbscroll_friction" double: 1.0;
   value "thumbscroll_bounce_friction" double: 0.5;
-  value "thumbscroll_bounce_enable" uchar: 1;
+  value "thumbscroll_bounce_enable" uchar: 0;
   value "page_scroll_friction" double: 0.5;
   value "bring_in_scroll_friction" double: 0.5;
   value "zoom_friction" double: 0.5;
   value "thumbscroll_border_friction" double: 0.5;
+  value "thumbscroll_sensitivity_friction" double: 1.0;
   value "scroll_smooth_amount" double: 0.0;
   value "scroll_smooth_history_weight" double: 0.3;
   value "scroll_smooth_future_time" double: 0.0;
@@ -27,9 +28,9 @@ group "Elm_Config" struct {
   value "font_cache" int: 512;
   value "edje_cache" int: 32;
   value "edje_collection_cache" int: 64;
-  value "finger_size" int: 40;
+  value "finger_size" int: 60;
   value "fps" double: 6000.0;
-  value "theme" string: "default";
+  value "theme" string: "tizen-black-hd";
   value "modules" string: "ctxpopup_copypasteUI>entry/api:decarta>map/api";
   value "tooltip_delay" double: 1.0;
   value "cursor_engine_only" uchar: 1;
@@ -40,8 +41,19 @@ group "Elm_Config" struct {
   value "inwin_dialogs_enable" uchar: 0;
   value "icon_size" int: 32;
   value "longpress_timeout" double: 0.5;
-  value "input_panel_enable" int: 1;
+  value "effect_enable" uchar: 1;
   value "password_show_last" uchar: 1;
   value "password_show_last_timeout" double: 2.0;
-  value "effect_enable" uchar: 1;
+  value "glayer_zoom_finger_enable" uchar: 0;
+  value "glayer_zoom_finger_factor" double: 1.0;
+  value "glayer_zoom_wheel_factor" double: 0.05;
+  value "glayer_zoom_distance_tolerance" double: 1.0;
+  value "glayer_rotate_finger_enable" uchar: 0;
+  value "glayer_rotate_angular_tolerance" double: 0.034906585;
+  value "glayer_line_min_length" double: 1.0;
+  value "glayer_line_distance_tolerance" double: 3.0;
+  value "glayer_line_angular_tolerance" double: 0.34906585; /* Represents 20 DEG */
+  value "glayer_flick_time_limit_ms" uint: 60; /* 60 ms to finish flick */
+  value "glayer_long_tap_start_timeout" double: 1.2; /* 1.2 sec to start long-tap */
+  value "glayer_continues_enable" uchar: 1;          /* Continues gesture enabled */
 }