# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1273584536 -10800
# Node ID 8fcb49b868777837a272ed5794f814adc7a165a6
# Parent  9941bcf9934865ab8184e37f79f8dc0f39e221c2
Revision: 201017
Kit: 201019

diff -r 9941bcf99348 -r 8fcb49b86877 gssettingsuis/Gs/GSDisplayPlugin/Data/2000B591.xml
--- a/gssettingsuis/Gs/GSDisplayPlugin/Data/2000B591.xml	Tue Apr 27 16:56:32 2010 +0300
+++ b/gssettingsuis/Gs/GSDisplayPlugin/Data/2000B591.xml	Tue May 11 16:28:56 2010 +0300
@@ -4,7 +4,7 @@
 		<SetItem key="2" type="0" value="5"></SetItem>    <!--EBacklightPeriod-->
 		<SetItem key="3" type="0" value="-15"></SetItem>  <!--EBrightness-->
 		<SetItem key="4" type="0" value="1"></SetItem>    <!--EAmbientLightSensor-->
-		<SetItem key="5" type="0" value="5"></SetItem>    <!--EScreenSaverPeriod-->
+		<SetItem key="5" type="0" value="1"></SetItem>    <!--EScreenSaverPeriod-->
 		<SetItem key="6" type="0" value="3"></SetItem>    <!--EAutomaticBrightnessContral-->
 	</Setting>
 	<Setting mode="2"><!-- partial power saving mode -->
@@ -12,7 +12,7 @@
 		<SetItem key="2" type="0" value="5"></SetItem>    <!--EBacklightPeriod-->
 		<SetItem key="3" type="0" value="-15"></SetItem>  <!--EBrightness-->
 		<SetItem key="4" type="0" value="1"></SetItem>    <!--EAmbientLightSensor-->
-		<SetItem key="5" type="0" value="5"></SetItem>    <!--EScreenSaverPeriod-->
+		<SetItem key="5" type="0" value="1"></SetItem>    <!--EScreenSaverPeriod-->
 		<SetItem key="6" type="0" value="3"></SetItem>    <!--EAutomaticBrightnessContral-->
 	</Setting>
 </PowerSaveModeConfig>
\ No newline at end of file
diff -r 9941bcf99348 -r 8fcb49b86877 profilesservices/FileList/Src/CFLDPopupList.cpp
--- a/profilesservices/FileList/Src/CFLDPopupList.cpp	Tue Apr 27 16:56:32 2010 +0300
+++ b/profilesservices/FileList/Src/CFLDPopupList.cpp	Tue May 11 16:28:56 2010 +0300
@@ -130,6 +130,7 @@
 			feedback->InstantFeedback(this, ETouchFeedbackBasic);
 			}
 #endif //RD_TACTILE_FEEDBACK		}
+		AttemptExitL(EFalse);
 		}
 	CAknPopupList::HandlePointerEventL(aPointerEvent);
 	 }
diff -r 9941bcf99348 -r 8fcb49b86877 profilesservices/MediaFileList/Src/mediafiledialog.cpp
--- a/profilesservices/MediaFileList/Src/mediafiledialog.cpp	Tue Apr 27 16:56:32 2010 +0300
+++ b/profilesservices/MediaFileList/Src/mediafiledialog.cpp	Tue May 11 16:28:56 2010 +0300
@@ -3096,14 +3096,14 @@
 
     if ( aEventType == EEventItemDoubleClicked || aEventType == EEventEnterKeyPressed )
         {
+        iIsDoubleClicked = ETrue;
         TBool closeDialog = HandleOKL( EAttrDoubleClicked );
         
         if ( closeDialog )
             {
             // close after short delay (dialog cannot be closed from this function)
             CloseDialogWithDelayL();
-            }
-        iIsDoubleClicked = ETrue;
+            }        
         }
     if ( aEventType == EEventItemDraggingActioned )
     	{