phoneapp/phoneuistates/src/cphoneemergency.cpp
branchRCL_3
changeset 12 b68fcd923911
parent 10 ba54057fe027
child 14 b8d67d6176f5
--- a/phoneapp/phoneuistates/src/cphoneemergency.cpp	Tue May 11 16:13:03 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneemergency.cpp	Tue May 25 12:41:50 2010 +0300
@@ -218,6 +218,8 @@
     if ( aCallId == KEmergencyCallId )
         {
         iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
+        // Make sure that toolbar is not shown any more
+        iViewCommandHandle->ExecuteCommandL( EPhoneViewHideToolbar );
         // Remove emergency connecting note if still there
         iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNote );
         // Close menu bar, if it is displayed
@@ -338,6 +340,14 @@
         // Close menu bar, if it is displayed
         iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
 
+        // Dim toolbar items
+        SetToolbarDimming( ETrue );
+
+        // Request that dimmed toolbar is visible.
+        // Do it already here. Otherwice a white/black toolbar area is shortly shown and
+        // a white screen can be a result when touching it.
+        iViewCommandHandle->HandleCommandL( EPhoneViewShowToolbar );
+
         // Disable global notes when the phone is dialling
         TPhoneCmdParamBoolean globalNotifierParam;
         globalNotifierParam.SetBoolean( ETrue );
@@ -381,8 +391,6 @@
 
         SetTouchPaneButtons( EPhoneEmergencyCallButtons );
 
-        SetToolbarDimming( ETrue );
-
         ShowNoteL( EPhoneEmergencyConnectWaitNote );
 
         UpdateSetupCbaL();