# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1286969548 -10800
# Node ID 37cf54fb509fc12b4287b1a7fc42ab94af0f5010
# Parent  5a31ddd3bfd94020b999eea93e57fd91a7b355a8
Revision: 201039
Kit: 201041

diff -r 5a31ddd3bfd9 -r 37cf54fb509f fmradio/fmradio/inc/fmradiodefines.h
--- a/fmradio/fmradio/inc/fmradiodefines.h	Wed Sep 15 12:13:25 2010 +0300
+++ b/fmradio/fmradio/inc/fmradiodefines.h	Wed Oct 13 14:32:28 2010 +0300
@@ -118,7 +118,7 @@
 const TInt  KFMRadioRdsViewer = 316;
 const TInt  KFMRadioRdsInteractionIndicatorId = 317;
 const TInt  KFMRadioLogoId = 318;
-const TReal KFMRadioIndicatorOpacityInHiddenState = 0.4f;
+const TReal KFMRadioIndicatorOpacityInHiddenState = 0.2f;
 const TReal KFMRadioRdsViewerOpacityHidden = 0.0f;
 const TReal KFMRadioRdsViewerOpacityShow = 0.4f;
 
diff -r 5a31ddd3bfd9 -r 37cf54fb509f fmradio/fmradio/src/fmradioappui.cpp
--- a/fmradio/fmradio/src/fmradioappui.cpp	Wed Sep 15 12:13:25 2010 +0300
+++ b/fmradio/fmradio/src/fmradioappui.cpp	Wed Oct 13 14:32:28 2010 +0300
@@ -1357,22 +1357,15 @@
     if ( !(iFMRadioVariationFlags & KFMRadioInternalAntennaSupported) &&
             iCurrentRadioState != EFMRadioStateOffForPhoneCall && 
             iCurrentRadioState != EFMRadioStateOffBeforePhoneCall )
-        {        
-        if ( !iRadioEngine->IsRadioOn() && !iRadioEngine->IsInCall() )
+        {
+        // active offline query controls radio on/off
+        if ( iAudioLost )
             {
-            FTRACE( FPrint( _L("CFMRadioAppUi::HandleHeadsetReconnectedCallback() - Turn radio on") ) );
-            TurnRadioOn();
-            } 
-        // active offline query controls radio on/off
-        else if ( iAudioLost )
-            {
-            FTRACE( FPrint( _L("CFMRadioAppUi::HandleHeadsetReconnectedCallback() - Try to resume") ) );
             TRAP_IGNORE( TryToResumeAudioL() );	
             }
         else if ( ( iGlobalOfflineQuery && !iGlobalOfflineQuery->IsActive() ) ||
               !iGlobalOfflineQuery )
             {
-            FTRACE( FPrint( _L("CFMRadioAppUi::HandleHeadsetReconnectedCallback() - Offline query") ) );
             iRadioEngine->InitializeRadio();
             }
         HandleVolumeChangedCallback();
@@ -2581,8 +2574,7 @@
                         }
                     else
                         {
-                        TFMRadioRegionSetting region = iRadioEngine->GetRegionL();
-                        TBool mute = EFalse;
+                        TFMRadioRegionSetting region = iRadioEngine->GetRegionL();  
                         
                         if ( iOfflineQueryDialogActivated || 
                              iConnectHeadsetQuery || 
@@ -2593,22 +2585,11 @@
                         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();
-                            }
                         }
                     }
                 }
diff -r 5a31ddd3bfd9 -r 37cf54fb509f fmradio/help/data/xhtml.zip
Binary file fmradio/help/data/xhtml.zip has changed
diff -r 5a31ddd3bfd9 -r 37cf54fb509f fmradio/loc/fmradio.loc
--- a/fmradio/loc/fmradio.loc	Wed Sep 15 12:13:25 2010 +0300
+++ b/fmradio/loc/fmradio.loc	Wed Oct 13 14:32:28 2010 +0300
@@ -263,7 +263,7 @@
 // d: Shown if the 3.5mm analog audio accessory required as antenna is not connected
 // l: popup_note_window
 //
-#define qtn_fmradio_error_con_headset     "Please connect your wired headset with the phone’s 3.5mm connector"
+#define qtn_fmradio_error_con_headset     "Connect wired headset with 3.5mm connector"
 
 // d: Confirmation query 
 // d: Replaces all existing stations with the new ones on the list.