equal
deleted
inserted
replaced
463 #ifndef RD_MULTIPLE_DRIVE |
463 #ifndef RD_MULTIPLE_DRIVE |
464 MountMMC(); |
464 MountMMC(); |
465 MMCStatusChangedL(); |
465 MMCStatusChangedL(); |
466 iHideFirstBeep = EFalse; |
466 iHideFirstBeep = EFalse; |
467 #else // RD_MULTIPLE_DRIVE |
467 #else // RD_MULTIPLE_DRIVE |
|
468 if(iSysApDriveList == NULL) |
|
469 { |
|
470 iSysApDriveList = CSysApDriveList::NewL( iEikonEnv->FsSession() ); |
|
471 } |
468 iSysApDriveList->MountDrive( iSysApDriveList->DefaultMemoryCard() ); |
472 iSysApDriveList->MountDrive( iSysApDriveList->DefaultMemoryCard() ); |
469 UpdateInsertedMemoryCardsL(); |
473 UpdateInsertedMemoryCardsL(); |
470 #endif // RD_MULTIPLE_DRIVE |
474 #endif // RD_MULTIPLE_DRIVE |
471 } |
475 } |
472 |
476 |
473 if ( iSysApFeatureManager->MmcHotSwapSupported() ) |
477 if ( iSysApFeatureManager->MmcHotSwapSupported() ) |
474 { |
478 { |
|
479 if(iSysApMMCObserver == NULL) |
|
480 { |
|
481 iSysApMMCObserver = CSysApMMCObserver::NewL( |
|
482 iEikonEnv->FsSession(), *iSysApDriveList, *this, iSysApFeatureManager->MmcHotSwapSupported() ); |
|
483 } |
475 iSysApMMCObserver->StartMountObserver(); |
484 iSysApMMCObserver->StartMountObserver(); |
476 } |
485 } |
477 |
486 |
478 if ( !iSysApPsmController ) // created here if first state change has not occurred yet |
487 if ( !iSysApPsmController ) // created here if first state change has not occurred yet |
479 { |
488 { |
563 } |
572 } |
564 |
573 |
565 if( IsStateNormal() ) |
574 if( IsStateNormal() ) |
566 { |
575 { |
567 TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL to normal state.") ) ); |
576 TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL to normal state.") ) ); |
568 |
577 |
569 if ( iSysApFeatureManager->MmcSupported() ) |
|
570 { |
|
571 #ifndef RD_MULTIPLE_DRIVE |
|
572 MountMMC(); |
|
573 MMCStatusChangedL(); |
|
574 iHideFirstBeep = EFalse; |
|
575 #else // RD_MULTIPLE_DRIVE |
|
576 iSysApDriveList->MountDrive( iSysApDriveList->DefaultMemoryCard() ); |
|
577 UpdateInsertedMemoryCardsL(); |
|
578 #endif // RD_MULTIPLE_DRIVE |
|
579 } |
|
580 if ( iSysApFeatureManager->MmcHotSwapSupported() ) |
|
581 { |
|
582 iSysApMMCObserver->StartMountObserver(); |
|
583 } |
|
584 |
|
585 iSysApBtController = CreateSysApBtControllerL( *this ); |
578 iSysApBtController = CreateSysApBtControllerL( *this ); |
586 iSysApBtSapController = CreateSysApBtSapControllerL( *this ); |
579 iSysApBtSapController = CreateSysApBtSapControllerL( *this ); |
587 |
580 |
588 if ( iActivateBt ) |
581 if ( iActivateBt ) |
589 { |
582 { |
2770 |
2763 |
2771 TKeyResponse response(EKeyWasNotConsumed); |
2764 TKeyResponse response(EKeyWasNotConsumed); |
2772 if (response) |
2765 if (response) |
2773 { |
2766 { |
2774 //Do nothing:: To supress warning |
2767 //Do nothing:: To supress warning |
2775 } |
|
2776 if (iSysApKeyManagement && aKeyEvent.iCode != EKeyPowerOff && aKeyEvent.iCode != 'E') |
|
2777 { |
|
2778 response = iSysApKeyManagement->HandleKeyEventL(aKeyEvent, aType ); |
|
2779 } |
2768 } |
2780 |
2769 |
2781 if( aType == EEventKey ) |
2770 if( aType == EEventKey ) |
2782 { |
2771 { |
2783 switch ( aKeyEvent.iCode ) |
2772 switch ( aKeyEvent.iCode ) |