equal
deleted
inserted
replaced
584 } |
584 } |
585 } |
585 } |
586 |
586 |
587 void CAknFepSharedDataInterface::HandleInputTextLanguageGSChange() |
587 void CAknFepSharedDataInterface::HandleInputTextLanguageGSChange() |
588 { |
588 { |
589 iFepManager->SetFlag(CAknFepManager::EFlagNewSharedDataInputLanguage); |
589 if( iFepManager->ActiveInputLanguage() != PenInputLanguage() ) |
590 ESubVariantFlag subVariant = AknLayoutUtils::SubVariant(); |
590 { |
591 if((AknLayoutUtils::Variant() == EApacVariant) |
591 iFepManager->SetFlag(CAknFepManager::EFlagNewSharedDataInputLanguage); |
592 && ((subVariant == EPrcSubVariant) |
592 ESubVariantFlag subVariant = AknLayoutUtils::SubVariant(); |
593 || (subVariant == EHongKongSubVariant) |
593 if((AknLayoutUtils::Variant() == EApacVariant) |
594 || (subVariant == ETaiwanSubVariant))) |
594 && ((subVariant == EPrcSubVariant) |
595 { |
595 || (subVariant == EHongKongSubVariant) |
596 iFepManager->SetFlag(CAknFepManager::EFlagNewSharedDataInputMode); |
596 || (subVariant == ETaiwanSubVariant))) |
|
597 { |
|
598 iFepManager->SetFlag(CAknFepManager::EFlagNewSharedDataInputMode); |
|
599 } |
|
600 iFepManager->SetActiveInputLanguage( PenInputLanguage() ); |
597 } |
601 } |
598 } |
602 } |
599 |
603 |
600 |
604 |
601 TInt CAknFepSharedDataInterface::PredictiveTextSettingChangeGSNotification(TAny* aObj) |
605 TInt CAknFepSharedDataInterface::PredictiveTextSettingChangeGSNotification(TAny* aObj) |
766 { |
770 { |
767 // Active keyboard is virtual keyboard |
771 // Active keyboard is virtual keyboard |
768 RProperty::Get( KPSUidAknFep, KAknFepVirtualKeyboardType, |
772 RProperty::Get( KPSUidAknFep, KAknFepVirtualKeyboardType, |
769 keyboardType ); |
773 keyboardType ); |
770 } |
774 } |
771 #else if |
775 #else |
772 // Get physical keyboard type |
776 // Get physical keyboard type |
773 RProperty::Get(KCRUidAvkon, KAknKeyBoardLayout, keyboardType ); |
777 RProperty::Get(KCRUidAvkon, KAknKeyBoardLayout, keyboardType ); |
774 #endif |
778 #endif |
775 |
779 |
776 if ( keyboardType <= 0 || keyboardType >= EPtiKeyboardMaxLayout ) |
780 if ( keyboardType <= 0 || keyboardType >= EPtiKeyboardMaxLayout ) |