--- a/browserui/browser/BrowserAppSrc/BrowserContentView.cpp	Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/BrowserAppSrc/BrowserContentView.cpp	Thu Aug 27 07:42:55 2009 +0300
@@ -274,6 +274,10 @@
         }
 #endif  // __RSS_FEEDS
 
+    if ( ( aCommand != EWmlCmdZoomSliderShow ) && ZoomSliderVisible() )
+        {
+        MakeZoomSliderVisibleL( EFalse );
+        }
     switch ( aCommand )
         {
         case EWmlCmdFavourites:
@@ -897,27 +901,6 @@
         EnableFullScreenModeL( ETrue );
         iWasContentFullScreenMode = EFalse;
         }
-
-    // Any other commands must cause the zoom slider to be hidden (if it is
-    // currently visible).
-   switch ( aCommand )
-        {
-        // case EWmlCmdZoomMode:
-        case EWmlCmdZoomSliderShow:
-            {
-            // Do nothing, we want to display zoom indicator
-            break;
-            }
-        default:
-            {
-            // If any other command and zoom indicator is displayed, close it
-            if ( ZoomSliderVisible() )
-                {
-                MakeZoomSliderVisibleL( EFalse );
-                }
-            break;
-            }
-        }   // end of switch
     }
 
 // -----------------------------------------------------------------------------
@@ -1223,8 +1206,7 @@
         {
         TBrCtlDefs::TBrCtlElementType elementtype =
             ApiProvider().BrCtlInterface().FocusedElementType();
-        if( (elementtype == TBrCtlDefs::EElementActivatedInputBox ) ||
-            (elementtype == TBrCtlDefs::EElementActivatedObjectBox ) )
+        if( elementtype == TBrCtlDefs::EElementActivatedObjectBox )
             {
             if ( !iContentFullScreenMode )
                 {
@@ -2753,6 +2735,10 @@
         {
         iContainer->HandleResourceChange(KEikDynamicLayoutVariantSwitch);
         UpdateFullScreenL();
+        if(KeymapIsUp())
+            {
+            RedrawKeymap();
+            }
         }
     }
 
@@ -3124,8 +3110,10 @@
 {
   iIsPluginFullScreenMode = aFullScreen;
   if (aFullScreen) {
-    iOrientation = AppUi()->Orientation();
-    TRAP_IGNORE( AppUi()->SetOrientationL(CAknAppUiBase::EAppUiOrientationLandscape));
+  	if (AppUi()->Orientation() != CAknAppUiBase::EAppUiOrientationLandscape) {
+      iOrientation = AppUi()->Orientation();
+      TRAP_IGNORE(AppUi()->SetOrientationL(CAknAppUiBase::EAppUiOrientationLandscape));
+    }
     if (iPenEnabled) {
       Toolbar()->SetToolbarVisibility( EFalse, EFalse );
     }