Revision: 201034 RCL_3
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Wed, 15 Sep 2010 12:13:25 +0300
branchRCL_3
changeset 52 5a31ddd3bfd9
parent 46 93c594350b9a
child 60 37cf54fb509f
Revision: 201034 Kit: 201036
fmradio/fmradio/inc/fmradiodefines.h
fmradio/fmradio/src/fmradioappui.cpp
--- a/fmradio/fmradio/inc/fmradiodefines.h	Wed Sep 01 12:30:32 2010 +0100
+++ b/fmradio/fmradio/inc/fmradiodefines.h	Wed Sep 15 12:13:25 2010 +0300
@@ -118,7 +118,7 @@
 const TInt  KFMRadioRdsViewer = 316;
 const TInt  KFMRadioRdsInteractionIndicatorId = 317;
 const TInt  KFMRadioLogoId = 318;
-const TReal KFMRadioIndicatorOpacityInHiddenState = 0.2f;
+const TReal KFMRadioIndicatorOpacityInHiddenState = 0.4f;
 const TReal KFMRadioRdsViewerOpacityHidden = 0.0f;
 const TReal KFMRadioRdsViewerOpacityShow = 0.4f;
 
--- a/fmradio/fmradio/src/fmradioappui.cpp	Wed Sep 01 12:30:32 2010 +0100
+++ b/fmradio/fmradio/src/fmradioappui.cpp	Wed Sep 15 12:13:25 2010 +0300
@@ -2581,7 +2581,8 @@
                         }
                     else
                         {
-                        TFMRadioRegionSetting region = iRadioEngine->GetRegionL();  
+                        TFMRadioRegionSetting region = iRadioEngine->GetRegionL();
+                        TBool mute = EFalse;
                         
                         if ( iOfflineQueryDialogActivated || 
                              iConnectHeadsetQuery || 
@@ -2592,11 +2593,22 @@
                         else
                             {
                             iChannelListView->CancelMoveL();
+                            if ( iCurrentRadioState == EFMRadioStateBusyScanLocalStations )
+                                {
+                                mute = ETrue;
+                                }
                             ActivateLocalViewL( view->Id() );
                             }
                         TApaTask task( iCoeEnv->WsSession() );
                         task.SetWgId( iCoeEnv->RootWin().Identifier() );
                         task.BringToForeground();
+                        if ( mute )
+                            {
+                            // unmute if the scanning was ongoing
+                            iRadioEngine->SetMuteOn( EFalse );
+                            // just to make sure the mute status is up to date
+                            HandleVolumeChangedCallback();
+                            }
                         }
                     }
                 }