equal
deleted
inserted
replaced
42 #ifdef RD_SCALABLE_UI_V2 |
42 #ifdef RD_SCALABLE_UI_V2 |
43 #include <akntouchpane.h> |
43 #include <akntouchpane.h> |
44 #endif // RD_SCALABLE_UI_V2 |
44 #endif // RD_SCALABLE_UI_V2 |
45 |
45 |
46 #include <AknUtils.h> |
46 #include <AknUtils.h> |
|
47 #include <layoutmetadata.cdl.h> |
47 #include "aknitemactionmenuregister.h" |
48 #include "aknitemactionmenuregister.h" |
48 |
49 |
49 // MODULE DATA STRUCTURES |
50 // MODULE DATA STRUCTURES |
50 enum TAknViewFlags |
51 enum TAknViewFlags |
51 { |
52 { |
52 EAknViewForeground |
53 EAknViewForeground |
53 }; |
54 }; |
54 |
55 |
55 |
56 |
56 // CLASS DECLARATION |
57 // CLASS DECLARATION |
|
58 static const TUid KUidGlxApp = { 0x200009ee }; // App uid of photo |
|
59 static const TUid KUidVideoApp = { 0x200159b2 }; // App uid of video |
57 |
60 |
58 /** |
61 /** |
59 * Extension class. |
62 * Extension class. |
60 */ |
63 */ |
61 NONSHARABLE_CLASS(CAknViewExtension) : public CBase |
64 NONSHARABLE_CLASS(CAknViewExtension) : public CBase |
854 CleanupStack::Pop(); // menu |
857 CleanupStack::Pop(); // menu |
855 iMenu = menu; |
858 iMenu = menu; |
856 } |
859 } |
857 } |
860 } |
858 |
861 |
859 if ( iCba ) |
862 if (iCba) |
860 { |
863 { |
861 if ( aVisible ) |
864 if (aVisible) |
862 { |
865 { |
863 iCba->DrawableWindow()->SetOrdinalPosition( 0 ); |
866 //Added for fixing EAMI-856GRV and ESLM-85ZHQH: |
|
867 //As video app and photo app spend a long time at deactiveview,during this time only cba shows up,and this is ugly in landscape mode |
|
868 //so the solution is to don't call SetOrdinalPosition in video app and photo app while in landscape mode |
|
869 TUid appid = iAppUi->Application()->AppDllUid(); |
|
870 if (!(( appid == KUidVideoApp || appid == KUidGlxApp ) |
|
871 && Layout_Meta_Data::IsLandscapeOrientation())) |
|
872 { |
|
873 iCba->DrawableWindow()->SetOrdinalPosition( 0 ); |
|
874 } |
|
875 |
864 iCba->MakeVisible( ETrue ); |
876 iCba->MakeVisible( ETrue ); |
865 iCba->DrawNow(); // This is needed because problems if TRANSPARENCY is set, see MTVN-6HXCN4 |
877 iCba->DrawNow(); // This is needed because problems if TRANSPARENCY is set, see MTVN-6HXCN4 |
866 } |
878 } |
867 } |
879 } |
868 else |
880 else |