diff -r d9aefe59d544 -r fa6d9f75d6a6 camerauis/cameraxui/cxengine/conf/cameraxvariation.confml
--- a/camerauis/cameraxui/cxengine/conf/cameraxvariation.confml	Fri Apr 16 14:51:30 2010 +0300
+++ b/camerauis/cameraxui/cxengine/conf/cameraxvariation.confml	Mon May 03 12:22:55 2010 +0300
@@ -3,29 +3,33 @@
     <desc>CameraX Runtime Variation</desc>
 
     <setting ref="PrimaryCameraCaptureKeysCr" name="primary camera capture keys" type="string" readOnly="true">
-      <desc>PrimaryCameraCaptureKeysCr defines the key scan codes that are configured
-            as capture keys for primary camera.
+      <desc>PrimaryCameraCaptureKeysCr defines the capture keys for primary camera.
+            Both key code and scan code are needed for full functionality.
       </desc>
     </setting>
 
     <setting ref="SecondaryCameraCaptureKeysCr" name="secondary camera capture keys" type="string" readOnly="true">
-      <desc>SecondaryCameraCaptureKeysCr defines the key scan codes that are configured 
+      <desc>SecondaryCameraCaptureKeysCr defines the key scan codes that are configured
             as capture keys for secondary camera.
       </desc>
     </setting>
 
     <setting ref="PrimaryCameraAutofocusKeysCr" name="primary camera autofocus keys" type="string" readOnly="true">
-      <desc>PrimaryCameraAutofocusKeysCr defines the key scan codes that are configured 
-            as autofocus keys for primary camera.
+      <desc>PrimaryCameraAutofocusKeysCr defines the autofocus keys for primary camera.
+            Both key code and scan code are needed for full functionality.
       </desc>
     </setting>
 
-    <setting ref="ContrastItemsCr" name="contrast range" type="string" readOnly="true">
-      <desc>ContrastItemsCr defines the range which incluse the min value to max along with step size. e.g. -4, 4, 1</desc>
+    <setting ref="FreeMemoryLevelsCr" name="free memory levels" type="string" readOnly="true">
+      <desc>FreeMemoryLevelsCr defines the trigger levels for freeing memory and required levels of free memory.
+            All values are defined in bytes. There are 4 items in comma-separated list. Items are defined as follows:
+            1. Trigger level of free RAM when camera is started. If free RAM is below this, more free memory is requested.
+            2. Level of free RAM requested and required for camera to start, if trigger level (item 1) is met.
+      </desc>
     </setting>
-    
+
     <setting ref="StillMaxZoomValuesCr" name="Maximum still zoom values" type="string" readOnly="true">
-      <desc>Key defines maximum zoom limit specific to each image quality. The firt item represent max zoom limit
+      <desc>Key defines maximum zoom limit specific to each image quality. The first item represent max zoom limit
             for highest still resoultion and so on. We have only 5 entries, since we dont expect to have more than 5 still resoultions
             in any product. Use -1 when zoom limit is not supported for a particular resolution.
             Note: ECAM already has some limits which should be taken into account.
@@ -33,9 +37,9 @@
     </setting>
 
     <setting ref="VideoMaxZoomValuesCr" name="Maximum video zoom values" type="string" readOnly="true">
-      <desc>Key defines maximum zoom limit specific to each video quality. The firt item represent max zoom limit
+      <desc>Key defines maximum zoom limit specific to each video quality. The first item represent max zoom limit
             for highest video resoultion and so on. We have only 5 entries, since we dont expect to have more than 5 video resoultions
-            in any product. Use -1 when zoom limit is not supported for a particular resolution. 
+            in any product. Use -1 when zoom limit is not supported for a particular resolution.
             Note: ECAM already has some limits which should be taken into account.
       </desc>
     </setting>
@@ -44,10 +48,10 @@
 
   <data>
     <CxRuntimeFeaturesCrUid>
-      <PrimaryCameraCaptureKeysCr>0xab</PrimaryCameraCaptureKeysCr>
+      <PrimaryCameraCaptureKeysCr>0xab,0xf849</PrimaryCameraCaptureKeysCr>
       <SecondaryCameraCaptureKeysCr>0xab,0xa7</SecondaryCameraCaptureKeysCr>
-      <PrimaryCameraAutofocusKeysCr>0xe2</PrimaryCameraAutofocusKeysCr>
-      <ContrastItemsCr>-4,4,1</ContrastItemsCr>
+      <PrimaryCameraAutofocusKeysCr>0xe2,0xf880</PrimaryCameraAutofocusKeysCr>
+      <FreeMemoryLevelsCr>8000000,10000000</FreeMemoryLevelsCr>
       <StillMaxZoomValuesCr>32,32,32,32,32</StillMaxZoomValuesCr>
       <VideoMaxZoomValuesCr>40,40,40,-1,-1</VideoMaxZoomValuesCr>
     </CxRuntimeFeaturesCrUid>