MCL/sf/mw/classicui: comparison uifw/AvKon/src/AknCharMap.cpp

equal deleted inserted replaced

-:fcdfafb36fe7
+:aecbbf00d063
 #include <PUAcodes.hrh>
 #include <s32file.h>
 #include <AknPanic.h>
 #include "aknSctDialog.h" // CAknCharmapDialog
 #include <aknPopupHeadingPane.h>
-#include <aknfep.rsg>
+//#include <aknfep.rsg>
 #include <bautils.h>
 #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
 #include <uikon/eikenvinterface.h>
 #endif
 #include <eikedwin.h>
 #include <gulbordr.h>
 #include <touchfeedback.h>
 #include <eiklabel.h>
 #include <aknphysics.h>
-#include <AknPriv.hrh>
 #include "PictograhGrouping.h"
 #include "AknSettingCache.h"
 #include "aknsctfocushandler.h"
 const TUint KHistoryEmptyChar = CEditableText::ETabCharacter;
 const TUint KHistoryEmptyCharForDisplay = CEditableText::ESpace;
+const TInt KAknSctRadioOn = 1;
+const TInt KAknSctRadioOff = 0;
 const TInt KAreaIdRecent = 0;
 const TInt KAreaIdMain   = 1;
 const TInt KAreaIdTail   = 2;
+// ----------------------------------------------------------------------------
+// TEmotionUtils definition
+// ----------------------------------------------------------------------------
+//
+const TUint KEmotionCharBase = 0xf880;
+class TEmotionUtils
+{
+public:
+static TBool IsEmotionChar(TChar aChar);
+static TChar EmotionChar(TInt aId);
+static TInt EmotionId(TChar aChar);
+static TChar EmotionSwitchToSmileyChar();
+static TChar EmotionSwitchToSctChar();
+};
+TBool TEmotionUtils::IsEmotionChar(TChar aChar)
+{
+return (aChar >= KEmotionCharBase);
+}
+TChar TEmotionUtils::EmotionChar(TInt aId)
+{
+return (KEmotionCharBase + aId);
+}
+TInt TEmotionUtils::EmotionId(TChar aChar)
+{
+return (TInt)(aChar - KEmotionCharBase);
+}
+TChar TEmotionUtils::EmotionSwitchToSmileyChar()
+{
+return KEmotionCharBase + CSmileyModel::EIconSwitchToSmiley;
+}
+TChar TEmotionUtils::EmotionSwitchToSctChar()
+{
+return KEmotionCharBase + CSmileyModel::EIconSwitchToSct;
+}
 // ----------------------------------------------------------------------------
 // CAknCharMapHistory definition
 // ----------------------------------------------------------------------------
 * Insert a character which select on SCT/Picto.
 * @since 2.8
 * @param aHistoryType The kind of charctor map, refer to THistoryType
 * @param aChar    Insert a character
 */
-void InsertChar(THistoryType aHistoryType, const TChar aChar, TBool aIsEmotion);
+void InsertChar(THistoryType aHistoryType, const TChar aChar);
 private:
 /**
 * C++ default constructor.
 * @since 2.8
 // ----------------------------------------------------------------------------
 // Navi button class definition
 // ----------------------------------------------------------------------------
 //
-NONSHARABLE_CLASS(CAknSctNaviButton) : public CBase, public MCoeControlObserver
+NONSHARABLE_CLASS(CAknSctNaviButton) : public CBase
 {
 public:
-static CAknSctNaviButton* NewL(const CCoeControl& aParent, TInt aButtonId, TResourceReader& reader);
+static CAknSctNaviButton* NewL(
+const CCoeControl& aParent,
+TInt aButtonId,
+TResourceReader& reader);
 ~CAknSctNaviButton();
 private:
 CAknSctNaviButton(TInt aButtonId);
-void ConstructL(const CCoeControl& aParent, TResourceReader& reader);
+void ConstructL(
+const CCoeControl& aParent,
-private: // from MCoeControlObserver
+TResourceReader& reader);
-virtual void HandleControlEventL(CCoeControl* aControl, TCoeEvent aEventType);
 public:
-void SetObserver(MCoeControlObserver* aObserver);
 void SetFocused(TBool aState);
 void SetEnabled(TBool aState);
 TBool IsFocused();
 TBool IsEnabled();
 public:
 CAknButton* iButtonControl;
-MCoeControlObserver* iObserver;
 TInt iButtonId;
 TBool iPressed;
 TBool iRepeat;
+};
+// ----------------------------------------------------------------------------
+// Table Navi class definition
+// ----------------------------------------------------------------------------
+//
+NONSHARABLE_CLASS(CAknSctTableNavi) : public CAknControl, public MAknSctFocusHandler
+{
+public:
+CAknSctTableNavi(CAknCharMap* aCharMap, CAknCharMapExtension* aExtension);
+~CAknSctTableNavi();
+public:  // from CCoeControl
+TInt CountComponentControls() const;
+CCoeControl* ComponentControl( TInt aIndex ) const;
+virtual TKeyResponse OfferKeyEventL(const TKeyEvent& aKeyEvent, TEventCode);
+void ConstructFromResourceL(TResourceReader& aReader);
+virtual void HandlePointerEventL(const TPointerEvent& aPointerEvent);
+virtual TSize MinimumSize();
+virtual void SizeChanged();
+public: // from MAknSctFocusHandler
+virtual CCoeControl* FocusedControl();
+virtual TBool EnterControl(TInt aX, TInt aY);
+virtual void MoveFocus(TInt aX, TInt aY);
+virtual TBool ExitWithKey(TInt aKeycode);
+virtual TBool LeaveControl();
+public:
+TInt TableCount();
+void TableExitL();
+static TInt DoTableExit(TAny* aThis);
+void UpdateNextTableButtonL();
+private:
+TInt ButtonPosition(TInt aButtonIndex) const;
+TInt SetStatusChanged();
+void NextTableL();
+private:  // data
+TInt iButtonIndex;
+RPointerArray<CAknSctNaviButton> iButtonArray;
+CAknCharMap* iCharMap;
+CAknCharMapExtension* iExtension;
+CIdle *iIdle;
+TInt iPressedButtonIndex;
 };
 // ----------------------------------------------------------------------------
 // Navigator class definition
 // ----------------------------------------------------------------------------
 virtual TBool EnterControl(TInt aX, TInt aY);
 virtual void MoveFocus(TInt aX, TInt aY);
 virtual TBool ExitWithKey(TInt aKeycode);
 virtual TBool LeaveControl();
-public:
-void UpdateNextTableButtonL();
-TInt LastButton() const;
 private:
-void MoveFocus(TBool aInternalMove, TInt aX, TInt aY );
 TBool IsNextButton() const;
-TBool CalcNextStep( TUint aKey, TInt& aX, TInt& aY );
-void TableExitL();
-static TInt TableExitCallBackL(TAny* aThis);
-void DoTableExitL();
-void NextTableL();
-static TInt NextTableCallBackL(TAny* aThis);
-void DoNextTableL();
 private:  // data
 TInt iButtonIndex;
 RPointerArray<CAknSctNaviButton> iButtonArray;
 CAknCharMap* iCharMap;
 CAknCharMapExtension* iExtension;
 CEikLabel* iTitle;
-CIdle *iIdle;
 };
 // ----------------------------------------------------------------------------
 // Category button class defintion
 // ----------------------------------------------------------------------------
 //
 class CAknSctCategoryButton : public CBase
 // ----------------------------------------------------------------------------
 // Radio button class defintion
 // ----------------------------------------------------------------------------
 //
-// stay for BC
+class CAknSctRadioButton : public CAknControl, public MAknSctFocusHandler
-class CAknSctRadioButton : public CAknControl
+{
-{
+public:
+enum TAknSctRadioButtonFlags
+{
+EAknSctRadioButtonResize = 0x1,
+EAknSctRadioButtonEnd
+};
 public:
 CAknSctRadioButton();
+CAknSctRadioButton(CAknCharMap* aCharMap,
+CAknCharMapExtension* aExtension);
 ~CAknSctRadioButton();
+public: // from MAknSctFocusHandler
+virtual CCoeControl* FocusedControl();
+virtual TBool EnterControl(TInt aX, TInt aY);
+virtual void MoveFocus(TInt aX, TInt aY);
+virtual TBool ExitWithKey(TInt aKeycode);
+virtual TBool LeaveControl();
+public:  // from CCoeControl
+TInt CountComponentControls() const;
+CCoeControl* ComponentControl( TInt aIndex ) const;
+virtual TKeyResponse OfferKeyEventL(
+const TKeyEvent& aKeyEvent, TEventCode);
+void ConstructFromResourceL(TResourceReader& aReader);
+/**
+* This function handles pointer events directed at the charmapdialog.
+* @param aPointerEvent The pointer event directed at the charmapdialog.
+*/
+virtual void HandlePointerEventL(const TPointerEvent& aPointerEvent);
+virtual TSize MinimumSize();
+virtual void SizeChanged();
+virtual void Draw(const TRect& aRect) const;
+public:  // New function
+// The number of Buttons
+inline TInt Count() const;
+void SetCurrentCategory(TInt aCategory);
+void SetValidSctCase(TInt aSctCase);
+void RemoveInvalidButton();
 private:  // data
 RPointerArray<CAknSctCategoryButton> iButtonArray;
+MCoeControlObserver* iObserver;
+TInt iFlags;
+CAknCharMapExtension* iExtension;
+CAknCharMap* iCharMap;
+TInt iButtonIndex;
+TInt iEntryIndex;
 };
-CAknSctRadioButton::CAknSctRadioButton()
-{
-}
-CAknSctRadioButton::~CAknSctRadioButton()
-{
-iButtonArray.ResetAndDestroy();
-iButtonArray.Close();
-}
 // end of CAknSctRadioButton class definition
 // ----------------------------------------------------------------------------
 // Extension class defintion
 // ----------------------------------------------------------------------------
 //
 NONSHARABLE_CLASS(CAknCharMapExtension) :
 public CBase,
 public MObjectProvider,
 public MAknSctFocusHandler,
-public MAknSmileyObserver
+public MSmileyIconObserver
 {
 public:
 CAknCharMapExtension();
 ~CAknCharMapExtension();
 protected:
 TTypeUid::Ptr MopSupplyObject(TTypeUid aId);
 MObjectProvider* MopNext();
 private: // from MSmileyIconObserver
-virtual void SmileyStillImageLoaded(CAknSmileyIcon* aSmileyIcon);
+virtual void ThumbnailLoaded(CSmileyIcon* aSmileyIcon);
-virtual void SmileyAnimationChanged(CAknSmileyIcon* aSmileyIcon);
+virtual void AnimationChanged(CSmileyIcon* aSmileyIcon);
 public:
 TBool IsEmotionEnabled() const;
 TBool IsShowingEmotion() const;
-void SwitchEmotionVisibilityL();
 TBool NeedEmotionSwitchIcon() const;
 HBufC* ReadEmotionHBufCL();
-void LoadEmotionTumbnails(const TDesC& aText);
+void LoadEmotionTumbnails(const TDesC& aSctChars);
-void PlayAnimationL(const TDesC& aText);
-void StopAnimation(const TDesC& aText);
 void SetEmotionSize(const TSize& aSize);
-TBool IsEmotionChar(TChar aChar);
-TChar SwitchToSctChar();
+CSmileyIcon* EmotionIcon(TChar aEmotionChar);
-TChar SwitchToEmotionChar();
+TBool DrawEmotion(CWindowGc& aGc, const TRect& aRect, TChar aEmotionChar);
-CAknSmileyIcon* EmotionIcon(TChar aChar);
-const TDesC& EmotionText(TChar aChar);
-TBool DrawEmotion(CWindowGc& aGc, const TRect& aRect, CAknSmileyIcon* aSmileyIcon);
 void HandleFocusStatusChanged(TChar aChar, TBool aIsFocused);
 public: // data
 MCoeControlObserver *iObserver;
 HBufC* iCharsQwerty;
 TBool iKeyOkEvent; // ETrue is set after pressing OK Key
 // FeatureManager
 TBool iPictographsBuffer;         // ETrue means Picto is valid.
 TBool iPictographsBufferGrouping; // ETrue means Picto grouping is valid.
+TBool iJapaneseSctUi;       // Title and Softkey for Japanese varinat
+TBool iHasCategoryButtonUi; // Has Category button UI
+CAknSctRadioButton* iRadioButton;
 TInt  iCurrentCategory;     // defined enum TAknSCTCategoryButton on avkon.hrh
 // QHD layout.
 CAknCharMap* iCharMapProxy;
 MAknSctFocusHandler* iFocusHandler;
+CAknSctTableNavi* iTableNavi;
 CAknSctPageNavi* iPageNavi;
 HBufC* iEntryBuf;
 CEikLabel* iCategoryTitle;
 CEikLabel* iCategoryEntry;
 TBool iSelectAllowed;
 // Focus scrolling is disabled if kinetic scrolling is used.
 TBool iKineticScrolling;
 // Indicates whether menu sct is highlighted or not.
 TBool iMenuSctHighlighted;
-// flag for focus status of char map dialog
-TBool iCharMapFocusGained;
 public: // for Emotion
 HBufC* iCharsSmiley;
-CSmileyModel* iSmileyModel;
+CSmileyModel iSmileyModel;
 TChar iLastFocusedSmileyChar;
 TBool iIsShowingEmotion;
 TBool iIsEnableEmotion;
 public: // Single click
 /**
 * Is highlight visible
 */
 TBool iHighlightVisible;
-/**
-* Is keyboard event
-*/
-TBool iKeyBrdEvent;
-private:
-CAknSctRadioButton iForBCDoNotUse;
 };
 // ----------------------------------------------------------------------------
 // Navi button class implementation
 // ----------------------------------------------------------------------------
 void CAknSctNaviButton::ConstructL(const CCoeControl& aParent, TResourceReader& aReader)
 {
 iButtonControl = CAknButton::NewL(aReader);
 iButtonControl->SetContainerWindowL(aParent);
-iButtonControl->SetObserver(this);
-}
-void CAknSctNaviButton::SetObserver(MCoeControlObserver* aObserver)
-{
-iObserver = aObserver;
-}
-void CAknSctNaviButton::HandleControlEventL(CCoeControl* aControl, TCoeEvent aEventType)
-{
-if(iObserver) iObserver->HandleControlEventL(aControl, aEventType);
 }
 CAknSctNaviButton::~CAknSctNaviButton()
 {
 delete iButtonControl;
 }
 void CAknSctNaviButton::SetFocused(TBool aState)
 {
 iButtonControl->SetFocus(aState);
-iButtonControl->DrawDeferred();
+iButtonControl->DrawNow();
 }
 void CAknSctNaviButton::SetEnabled(TBool aState)
 {
 iButtonControl->MakeVisible(aState);
 }
 TBool CAknSctNaviButton::IsEnabled()
 {
 return iButtonControl->IsVisible();
+}
+// ----------------------------------------------------------------------------
+// Table navi class implementation
+// ----------------------------------------------------------------------------
+//
+CAknSctTableNavi::CAknSctTableNavi(CAknCharMap* aCharMap, CAknCharMapExtension* aExtension) :
+iCharMap(aCharMap), iExtension(aExtension)
+{
+}
+CAknSctTableNavi::~CAknSctTableNavi()
+{
+if (iButtonArray.Count())
+{
+iButtonArray.ResetAndDestroy();
+}
+iButtonArray.Close();
+delete iIdle;
+}
+TInt CAknSctTableNavi::CountComponentControls() const
+{
+return iButtonArray.Count();
+}
+CCoeControl* CAknSctTableNavi::ComponentControl( TInt aIndex ) const
+{
+CCoeControl* rtn;
+if (aIndex < iButtonArray.Count())
+{
+rtn = iButtonArray[aIndex]->iButtonControl;
+}
+else
+{
+rtn = NULL;
+}
+return rtn;
+}
+TKeyResponse CAknSctTableNavi::OfferKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aModifiers)
+{
+CAknSctNaviButton* buttonObj = iButtonArray[iButtonIndex];
+buttonObj->iButtonControl->OfferKeyEventL(aKeyEvent,aModifiers);
+TKeyResponse response = EKeyWasNotConsumed;
+TUint code=aKeyEvent.iCode;
+switch (code)
+{
+case EKeyEnter:
+case EKeyOK:
+{
+switch (buttonObj->iButtonId)
+{
+case EAknSctTableNaviExit:
+{
+iExtension->iKeyOkEvent = ETrue;
+TableExitL();
+response = EKeyWasConsumed;
+}
+break;
+// add all supported table types here.
+case EAknSctTableNaviSpecialChar:
+case EAknSctTableNaviEmotion:
+{
+NextTableL();
+response = EKeyWasConsumed;
+}
+break;
+default:
+break;
+}
+}
+break;
+case EKeyLeftArrow:
+case '4':
+{
+MoveFocus(-1,0);
+response = EKeyWasConsumed;
+}
+break;
+case EKeyRightArrow:
+case '6':
+{
+MoveFocus(1,0);
+response = EKeyWasConsumed;
+}
+break;
+case EKeyUpArrow:
+case '2':
+{
+response = EKeyWasConsumed;
+if ((iButtonIndex==0) && !Layout_Meta_Data::IsLandscapeOrientation())
+{
+// Left page button.
+if (iExtension->iPageNavi && iExtension->iPageNavi->EnterControl(0,0))
+{
+LeaveControl();
+}
+}
+else
+{
+// Last radio button.
+if ((iButtonIndex==0) && iExtension->iRadioButton)
+{
+if (iExtension->iRadioButton->EnterControl(0,iExtension->iRadioButton->Count()-1))
+{
+LeaveControl();
+}
+break;
+}
+// Grid bottom row.
+TInt xPos = ButtonPosition(iButtonIndex);
+if (iCharMap->ColMax(0) > iCharMap->ColMax(xPos))
+{
+xPos = iCharMap->RowMax(iCharMap->ColMax(0));
+}
+if (iExtension->EnterControl(xPos,iCharMap->ColMax(xPos)))
+{
+LeaveControl();
+break;
+}
+}
+}
+break;
+case EKeyDownArrow:
+case '8':
+{
+response = EKeyWasConsumed;
+// First radio button.
+if ((iButtonIndex==0) && iExtension->iRadioButton)
+{
+if (iExtension->iRadioButton->EnterControl(0,0))
+{
+LeaveControl();
+}
+break;
+}
+// Grid top row.
+TInt xPos = ButtonPosition(iButtonIndex);
+if (iExtension->EnterControl(xPos,iCharMap->ColMin(xPos)))
+{
+LeaveControl();
+break;
+}
+}
+break;
+default:
+break;
+}
+return response;
+}
+void CAknSctTableNavi::TableExitL()
+{
+delete iIdle;
+iIdle = 0;
+iIdle = CIdle::NewL(CActive::EPriorityIdle);
+iIdle->Start(TCallBack(DoTableExit, this));
+}
+TInt CAknSctTableNavi::DoTableExit(TAny* aThis)
+{
+return ((CAknSctTableNavi*)aThis)->SetStatusChanged();
+}
+TInt CAknSctTableNavi::ButtonPosition(TInt aButtonIndex) const
+{
+// buttons behind the 1th are behavior as one button
+return (aButtonIndex==0) ? 0 : 1;
+}
+TInt CAknSctTableNavi::SetStatusChanged()
+{
+TRAPD(err, iCharMap->SetStatusChanged(EAknCharSelectedTableExitButton));
+return err;
+}
+void CAknSctTableNavi::NextTableL()
+{
+iCharMap->SetStatusChanged(EAknCharSelectedNextTableButton);
+}
+void CAknSctTableNavi::ConstructFromResourceL(TResourceReader& aReader)
+{
+// Table navi buttons.
+TInt counts = aReader.ReadInt16();
+for (TInt i = 0; i < counts; i++)
+{
+TInt buttonId = aReader.ReadInt16();
+TInt resId = aReader.ReadInt32();
+TResourceReader buttonReader;
+iCoeEnv->CreateResourceReaderLC(buttonReader, resId);
+CAknSctNaviButton* buttonObj = CAknSctNaviButton::NewL(*this, buttonId, buttonReader);
+iButtonArray.Append(buttonObj);
+CleanupStack::PopAndDestroy(); // buttonReader
+}
+}
+void CAknSctTableNavi::HandlePointerEventL(const TPointerEvent& aPointerEvent)
+{
+if (AknLayoutUtils::PenEnabled() && Rect().Contains(aPointerEvent.iPosition))
+{
+if (aPointerEvent.iType == TPointerEvent::EButton1Down)
+{
+iPressedButtonIndex = -1;
+for (TInt index = 0; index < iButtonArray.Count(); index++)
+{
+CAknSctNaviButton* buttonObj = iButtonArray[index];
+if(buttonObj->IsEnabled())
+{
+TRect buttonRect = buttonObj->iButtonControl->Rect();
+if (buttonRect.Contains(aPointerEvent.iPosition))
+{
+iPressedButtonIndex = index;
+}
+}
+}
+}
+else if (aPointerEvent.iType == TPointerEvent::EButton1Up)
+{
+if(iPressedButtonIndex >= 0)
+{
+CAknSctNaviButton* buttonObj = iButtonArray[iPressedButtonIndex];
+if(buttonObj->IsEnabled())
+{
+iButtonIndex = iPressedButtonIndex;
+TRect buttonRect = buttonObj->iButtonControl->Rect();
+if (buttonRect.Contains(aPointerEvent.iPosition))
+{
+switch (buttonObj->iButtonId)
+{
+case EAknSctTableNaviExit:
+{
+iExtension->iKeyOkEvent = ETrue;
+TableExitL();
+}
+return;
+case EAknSctTableNaviSpecialChar:
+case EAknSctTableNaviEmotion:
+{
+NextTableL();
+}
+return;
+default:
+break;
+}
+}
+}
+}
+}
+}
+CCoeControl::HandlePointerEventL(aPointerEvent);
+}
+TSize CAknSctTableNavi::MinimumSize()
+{
+return Rect().Size();
+}
+void CAknSctTableNavi::SizeChanged()
+{
+if (iButtonArray.Count()>0)
+{
+TInt ctrlVariety = 2;
+TInt cellVariety = 1;
+if(!iCharMap->IsJapaneseSctUi())
+{
+ctrlVariety = (iCharMap->TableCount()>1) ? 0 : 1;
+cellVariety = 0;
+}
+TAknLayoutRect cellLayRect, buttonLayRect;
+TRect buttonRect;
+// Table exit.
+cellLayRect.LayoutRect(Rect(), AknLayoutScalable_Avkon::cell_graphic2_control_pane(ctrlVariety,0));
+buttonLayRect.LayoutRect(cellLayRect.Rect(), AknLayoutScalable_Avkon::bg_button_pane_cp05(cellVariety));
+buttonRect = buttonLayRect.Rect();
+TAknLayoutRect iconLayRect;
+iconLayRect.LayoutRect(buttonRect, AknLayoutScalable_Avkon::cell_graphic2_control_pane_g1(cellVariety));
+TSize iconSize = iconLayRect.Rect().Size();
+CAknSctNaviButton* buttonObj = iButtonArray[0];
+buttonObj->iButtonControl->SetRect(buttonRect);
+buttonObj->iButtonControl->SetHighlightRect(buttonRect);
+buttonObj->iButtonControl->SetIconScaleMode(EAspectRatioPreserved);
+buttonObj->iButtonControl->SetIconSize(iconSize);
+buttonObj->SetEnabled(ETrue);
+// Table change.
+if (iCharMap->TableCount() > 1)
+{
+cellLayRect.LayoutRect(Rect(), AknLayoutScalable_Avkon::cell_graphic2_control_pane(ctrlVariety,1));
+buttonLayRect.LayoutRect(cellLayRect.Rect(), AknLayoutScalable_Avkon::bg_button_pane_cp05(cellVariety));
+buttonRect = buttonLayRect.Rect();
+for (TInt i(1); i<iButtonArray.Count(); i++)
+{
+CAknSctNaviButton* buttonObj = iButtonArray[i];
+buttonObj->iButtonControl->SetRect(buttonRect);
+buttonObj->iButtonControl->SetHighlightRect(buttonRect);
+buttonObj->iButtonControl->SetIconScaleMode(EAspectRatioPreserved);
+buttonObj->iButtonControl->SetIconSize(iconSize);
+buttonObj->SetEnabled(ETrue);
+}
+}
+TRAP_IGNORE(UpdateNextTableButtonL());
+}
+}
+void CAknSctTableNavi::UpdateNextTableButtonL()
+{
+TBool isFocused = EFalse;
+// table switch buttons stay in one place.
+for(TInt index(1); index<iButtonArray.Count(); index++)
+{
+CAknSctNaviButton* buttonObj = iButtonArray[index];
+if(buttonObj->IsEnabled())
+{
+isFocused = buttonObj->IsFocused();
+}
+}
+// fresh focused button
+for (TInt index(1); index<iButtonArray.Count(); index++)
+{
+CAknSctNaviButton* buttonObj = iButtonArray[index];
+if (iCharMap->TableCount() > 1)
+{
+switch (iCharMap->NextTableCase())
+{
+case EAknCharMapTableSpecialChar:
+{
+TBool isShown = EFalse;
+if(iExtension->IsShowingEmotion())
+{
+isShown = (buttonObj->iButtonId==EAknSctTableNaviSpecialChar);
+}
+else
+{
+isShown = (buttonObj->iButtonId==EAknSctTableNaviEmotion);
+}
+buttonObj->SetEnabled(isShown);
+buttonObj->SetFocused(isShown && isFocused);
+if(isShown && isFocused)
+{
+iButtonIndex = index;
+}
+}
+break;
+default:
+buttonObj->SetEnabled(EFalse);
+break;
+}
+}
+else
+{
+buttonObj->SetEnabled(EFalse);
+}
+}
+}
+CCoeControl* CAknSctTableNavi::FocusedControl()
+{
+return this;
+}
+TBool CAknSctTableNavi::EnterControl(TInt aX, TInt /*aY*/)
+{
+if (IsVisible())
+{
+if ((aX >= 0) && (aX < iButtonArray.Count()))
+{
+TInt index = aX;
+if (AknLayoutUtils::LayoutMirrored()) // reverse.
+{
+index = (iButtonArray.Count() - 1) - aX;
+}
+index = ButtonPosition(index);
+for(; index<iButtonArray.Count(); index++)
+{
+CAknSctNaviButton* buttonObj = iButtonArray[index];
+if (buttonObj->IsEnabled())
+{
+iButtonIndex = index;
+iExtension->iFocusHandler = this;
+buttonObj->SetFocused(ETrue);
+return ETrue;
+}
+}
+}
+}
+return EFalse;
+}
+void CAknSctTableNavi::MoveFocus(TInt aX, TInt /*aY*/)
+{
+TInt delta = aX;
+if (AknLayoutUtils::LayoutMirrored()) // reverse.
+{
+delta = -aX;
+}
+TInt buttonIndex = iButtonIndex + delta;
+// loop until find next position
+for (TInt i = 0; i < iButtonArray.Count(); i++)
+{
+if (buttonIndex > iButtonArray.Count() - 1) // goto Next control
+{
+if (!Layout_Meta_Data::IsLandscapeOrientation())
+{
+// First radio button.
+if (iExtension->iRadioButton)
+{
+if (iExtension->iRadioButton->EnterControl(0,0))
+{
+LeaveControl();
+}
+break;
+}
+// Grid start.
+if (iExtension->EnterControl(0,iCharMap->ColMin(0)))
+{
+LeaveControl();
+}
+}
+else
+{
+// Left page button.
+if (iExtension->iPageNavi &&
+iExtension->iPageNavi->EnterControl(0,0))
+{
+LeaveControl();
+}
+}
+break;
+}
+else if (buttonIndex < 0) // goto Prev control
+{
+if (!Layout_Meta_Data::IsLandscapeOrientation())
+{
+// Right page button.
+if (iExtension->iPageNavi &&
+iExtension->iPageNavi->EnterControl(1,0))
+{
+LeaveControl();
+}
+}
+else
+{
+// Grid end.
+TInt posY = iCharMap->ColMax(0);
+if (iExtension->EnterControl(iCharMap->RowMax(posY),posY))
+{
+LeaveControl();
+}
+}
+break;
+}
+if (iButtonArray[buttonIndex]->IsEnabled()) // goto next button in This control
+{
+CAknSctNaviButton* buttonObj;
+buttonObj = iButtonArray[iButtonIndex];
+buttonObj->SetFocused(EFalse);
+iButtonIndex = buttonIndex;
+buttonObj = iButtonArray[iButtonIndex];
+buttonObj->SetFocused(ETrue);
+break;
+}
+buttonIndex += (delta < 0) ? -1 : 1; // get next position
+}
+}
+TBool CAknSctTableNavi::LeaveControl()
+{
+for (TInt i = 0; i < iButtonArray.Count(); i++ )
+{
+iButtonArray[i]->SetFocused(EFalse);
+}
+return ETrue;
+}
+TBool CAknSctTableNavi::ExitWithKey(TInt /*aKeycode*/)
+{
+if (iButtonArray[iButtonIndex]->iButtonId != EAknSctTableNaviExit)
+{
+return EFalse;
+}
+else
+{
+return ETrue;
+}
 }
 // ----------------------------------------------------------------------------
 // Page Navi class implementation
 // ----------------------------------------------------------------------------
 {
 iButtonArray.ResetAndDestroy();
 }
 iButtonArray.Close();
 delete iTitle;
-delete iIdle;
 }
 TInt CAknSctPageNavi::CountComponentControls() const
 {
 TInt num= 0;
 case EKeyEnter:
 case EKeyOK:
 {
 switch (buttonObj->iButtonId)
 {
-case EAknSctTableNaviExit:
-{
-iExtension->iKeyOkEvent = ETrue;
-TableExitL();
-}
-break;
 case EAknSctPageNaviPrevPage:
 {
 iCharMap->PrevPageL();
 }
 break;
 case EAknSctPageNaviNextPage:
 {
 iCharMap->NextPageL();
-}
-break;
-// add all supported table types here.
-case EAknSctTableNaviSpecialChar:
-case EAknSctTableNaviEmotion:
-{
-NextTableL();
 }
 break;
 default:
 return EKeyWasConsumed;
 }
 UpdatePageTitleL();
 }
 break;
 case EKeyLeftArrow:
 case '4':
+{
+MoveFocus(-1,0);
+response = EKeyWasConsumed;
+}
+break;
 case EKeyRightArrow:
 case '6':
+{
+MoveFocus(1,0);
+response = EKeyWasConsumed;
+}
+break;
 case EKeyUpArrow:
 case '2':
+{
+response = EKeyWasConsumed;
+if (!Layout_Meta_Data::IsLandscapeOrientation())
+{
+if (iExtension->iRadioButton && !IsNextButton())
+{
+// Last radio button.
+if (iExtension->iRadioButton->EnterControl(
+0,iExtension->iRadioButton->Count()-1))
+{
+LeaveControl();
+}
+break;
+}
+}
+TInt xPos;
+if (!Layout_Meta_Data::IsLandscapeOrientation())
+{
+xPos = IsNextButton() ? iCharMap->MaxCols() - 1 : 0;
+}
+else
+{
+if (IsNextButton())
+{
+xPos = iCharMap->MaxCols() - 1;
+}
+else
+{
+xPos = !iExtension->iRadioButton ?
+iCharMap->TableCount() : iCharMap->MaxCols()-2;
+}
+}
+if (iCharMap->ColMax(0) > iCharMap->ColMax(xPos))
+{
+xPos = iCharMap->RowMax(iCharMap->ColMax(0));
+}
+// Grid bottom row.
+if (iExtension->EnterControl(xPos,iCharMap->ColMax(xPos)))
+{
+LeaveControl();
+break;
+}
+}
+break;
 case EKeyDownArrow:
 case '8':
 {
-TInt gridX;
-TInt gridY;
-TBool gridInvolved = CalcNextStep( code, gridX, gridY );
-MoveFocus( !gridInvolved, gridX, gridY );
 response = EKeyWasConsumed;
+if (!Layout_Meta_Data::IsLandscapeOrientation())
+{
+if (!IsNextButton())
+{
+// First table button.
+if (iExtension->iTableNavi &&
+iExtension->iTableNavi->EnterControl(0,0))
+{
+LeaveControl();
+break;
+}
+}
+else
+{
+// Grid top row.
+TInt xPos = iCharMap->MaxCols() - 1;
+if (iExtension->EnterControl(xPos,iCharMap->ColMin(xPos)))
+{
+LeaveControl();
+break;
+}
+}
+}
+else
+{
+TInt xPos;
+if (IsNextButton())
+{
+xPos = iCharMap->MaxCols() - 1;
+}
+else
+{
+xPos = !iExtension->iRadioButton ?
+iCharMap->TableCount() : iCharMap->MaxCols() - 2;
+}
+// Grid top row.
+if (iExtension->EnterControl(xPos,iCharMap->ColMin(xPos)))
+{
+LeaveControl();
+break;
+}
+}
 }
 break;
 default:
 break;
 }
 return response;
-}
-TBool CAknSctPageNavi::CalcNextStep( TUint aKey, TInt& aX, TInt& aY )
-{
-TBool landscape = Layout_Meta_Data::IsLandscapeOrientation();
-TBool mirrored = AknLayoutUtils::LayoutMirrored();
-TBool emotionEnabled = iExtension->IsEmotionEnabled();
-TInt scPages = iCharMap->PageCount();
-aX = 0;
-aY = 0;
-TInt xOffset = 0;
-TInt yOffset = 0;
-// Simplify key events to two variants
-switch ( aKey )
-{
-case EKeyLeftArrow:
-case '4':
-{
-xOffset = -1;
-}
-break;
-case EKeyRightArrow:
-case '6':
-{
-xOffset = 1;
-}
-break;
-case EKeyDownArrow:
-case '8':
-{
-yOffset = 1;
-}
-break;
-case EKeyUpArrow:
-case '2':
-{
-yOffset = -1;
-}
-break;
-default:
-break;
-}
-TInt runtimeIndex = iButtonIndex;
-if ( !emotionEnabled )
-{
-// SC/Emotion unabled, button regrouped!
-if ( ( mirrored && iButtonIndex == EAknSctPageNaviPrevPage && xOffset != 1 )
-|| ( !mirrored && iButtonIndex == EAknSctPageNaviNextPage && xOffset != -1) )
-{
-runtimeIndex = iExtension->IsShowingEmotion()?EAknSctTableNaviSpecialChar:EAknSctTableNaviEmotion;
-}
-}
-// calculate when moving from PageNavi to grid, the column position
-switch ( runtimeIndex )
-{
-case EAknSctTableNaviExit:
-{
-aX = 0;
-if ( ( !mirrored && xOffset == -1 ) || ( mirrored && xOffset == 1 ) )
-{
-// Grid end
-aY = iCharMap->ColMax(0);
-aX = iCharMap->RowMax( aY );
-return ETrue;
-}
-else if ( mirrored && xOffset == -1 && scPages >= 2 )
-{
-xOffset = EAknSctPageNaviNextPage;
-}
-else if ( scPages < 2
-&& ( ( !mirrored && xOffset == 1 ) || ( mirrored && xOffset == -1 ) ) )
-{
-if ( !emotionEnabled )
-{
-// Grid start
-aX = 0;
-aY = iCharMap->ColMin( aX );
-return ETrue;
-}
-else
-{
-xOffset = LastButton();
-}
-}
-else
-{
-xOffset = EAknSctTableNaviExit + xOffset;
-}
-}
-break;
-case EAknSctPageNaviPrevPage:
-{
-aX = mirrored ? iCharMap->MaxCols()-2 : 1;
-if ( mirrored && xOffset == -1 )
-{
-xOffset = LastButton();
-}
-else
-{
-xOffset = xOffset + EAknSctPageNaviPrevPage;
-}
-}
-break;
-case EAknSctPageNaviNextPage:
-{
-aX = mirrored ? 1 : iCharMap->MaxCols()-2;
-if ( mirrored && xOffset == 1 )
-{
-xOffset = 0;
-}
-else if ( !mirrored && xOffset == 1 )
-{
-xOffset = LastButton();
-}
-else
-{
-xOffset = EAknSctPageNaviNextPage + xOffset;
-}
-}
-break;
-case EAknSctTableNaviSpecialChar:
-case EAknSctTableNaviEmotion:
-{
-aX = iCharMap->MaxCols()-1;
-if ( ( !mirrored && xOffset == 1 ) || ( mirrored && xOffset == -1 ) )
-{
-// Grid start
-aX = 0;
-aY = iCharMap->ColMin( aX );
-return ETrue;
-}
-else if ( scPages < 2
-&& ( ( !mirrored && xOffset == -1 ) || ( mirrored && xOffset == 1 ) ) )
-{
-xOffset = EAknSctTableNaviExit;
-}
-else if ( mirrored && xOffset == 1 )
-{
-xOffset = EAknSctPageNaviPrevPage;
-}
-else
-{
-xOffset = EAknSctPageNaviNextPage;
-}
-}
-break;
-default:
-break;
-}
-if ( yOffset == 1 )
-{
-// DOWN
-aY = iCharMap->ColMin( aX );
-return ETrue;
-}
-else if ( yOffset == -1 )
-{
-// and UP
-aY = iCharMap->ColMax( aX );
-return ETrue;
-}
-// Return False means it's internal moving focus within Page Navi
-aX = xOffset;
-aY = 0;
-return EFalse;
 }
 TBool CAknSctPageNavi::IsNextButton() const
 {
 if (iButtonIndex < iButtonArray.Count() && iButtonArray[iButtonIndex])
 TResourceReader oneButtonReader;
 iCoeEnv->CreateResourceReaderLC(oneButtonReader, resId);
 CAknSctNaviButton* buttonObj =
 CAknSctNaviButton::NewL(*this, buttonId, oneButtonReader);
 buttonObj->iButtonControl->SetObserver(this); // for handling control events.
-CleanupStack::PushL( buttonObj );
+iButtonArray.Append(buttonObj);
-iButtonArray.AppendL(buttonObj);
-CleanupStack::Pop( buttonObj );
 CleanupStack::PopAndDestroy(); // oneButtonReader
 }
 iTitle = new (ELeave) CEikLabel;
 }
 if (aEventType == EEventStateChanged && AknLayoutUtils::PenEnabled()) // action on key repeat
 {
 for (TInt index=0; index < iButtonArray.Count(); index++)
 {
 CAknSctNaviButton* buttonObj = iButtonArray[index];
+TRect buttonRect = buttonObj->iButtonControl->Rect();
 if (buttonObj->iButtonControl == aControl)
 {
 if (buttonObj->IsEnabled() && buttonObj->iPressed)
 {
 iButtonIndex = index;
 {
 buttonObj->iRepeat = ETrue; // Set button repeat.
 iCharMap->PrevPageL();
 UpdatePageTitleL();
 }
-return;
+break;
 case EAknSctPageNaviNextPage:
 {
 buttonObj->iRepeat = ETrue; // Set button repeat.
 iCharMap->NextPageL();
 UpdatePageTitleL();
 }
-return;
+break;
 default:
 break;
 }
 }
 }
 for (TInt index=0; index < iButtonArray.Count(); index++)
 {
 CAknSctNaviButton* buttonObj = iButtonArray[index];
 buttonObj->iPressed = EFalse;
 buttonObj->iRepeat = EFalse;
-TInt buttonIndex = buttonObj->iButtonId;
 TRect buttonRect = buttonObj->iButtonControl->Rect();
-if ( buttonRect.Contains(aPointerEvent.iPosition))
+if (buttonRect.Contains(aPointerEvent.iPosition))
 {
 if (buttonObj->IsEnabled())
 {
+buttonObj->iButtonControl->SetButtonFlags(KAknButtonKeyRepeat);
 buttonObj->iPressed = ETrue; // Set button pressed.
-if ( buttonIndex == EAknSctPageNaviPrevPage
-|| buttonIndex == EAknSctPageNaviNextPage )
-{
-// Only Prev/Next button can repeat
-buttonObj->iButtonControl->SetButtonFlags( KAknButtonKeyRepeat );
-}
 }
 }
 }
 }
 else if (aPointerEvent.iType == TPointerEvent::EButton1Up) // action on button release.
 {
 iCharMap->NextPageL();
 UpdatePageTitleL();
 }
 break;
-case EAknSctTableNaviExit:
-{
-iExtension->iKeyOkEvent = ETrue;
-TableExitL();
-}
-break;
-case EAknSctTableNaviSpecialChar:
-case EAknSctTableNaviEmotion:
-{
-NextTableL();
-}
-break;
 default:
 break;
 }
 }
 }
 }
 void CAknSctPageNavi::SizeChanged()
 {
-TAknLayoutRect pageButtonLayRect, buttonLayRect;
+TAknLayoutRect pageButtonLayRect;
-TInt cellVar = Layout_Meta_Data::IsLandscapeOrientation()? 3 : 2;
+TInt pageVariate = !iCharMap->IsJapaneseSctUi() ? ((iCharMap->TableCount() > 1) ? 0 : 1) : 2;
-TInt bgVar = 2;
-TBool landScape = Layout_Meta_Data::IsLandscapeOrientation();
-TBool emotionEnabled = ETrue;
-TBool mirrored = AknLayoutUtils::LayoutMirrored();
 CAknSctNaviButton* buttonObj;
 TRect rect;
-if ( iExtension )
+buttonObj = iButtonArray[0];
-{
+buttonObj->iButtonControl->SetButtonFlags(0);
-emotionEnabled = iExtension->IsEmotionEnabled();
+if (!AknLayoutUtils::LayoutMirrored())
-}
+{
+buttonObj->iButtonId = EAknSctPageNaviPrevPage;
-// Prev button
+pageButtonLayRect.LayoutRect(Rect(),AknLayoutScalable_Avkon::bg_button_pane_cp10(pageVariate));
+}
+else
+{
+buttonObj->iButtonId = EAknSctPageNaviNextPage;
+pageButtonLayRect.LayoutRect(Rect(),AknLayoutScalable_Avkon::bg_button_pane_cp11(pageVariate));
+}
+rect = pageButtonLayRect.Rect();
+buttonObj->iButtonControl->SetRect(rect);
+buttonObj->iButtonControl->SetHighlightRect(rect);
+TAknLayoutRect pageButtonIconLayRect;
+pageButtonIconLayRect.LayoutRect(pageButtonLayRect.Rect(), AknLayoutScalable_Avkon::graphic2_pages_pane_g1(pageVariate));
+buttonObj->iButtonControl->SetIconScaleMode(EAspectRatioPreserved);
+TSize iconSize = pageButtonIconLayRect.Rect().Size();
+buttonObj->iButtonControl->SetIconSize(iconSize);
 buttonObj = iButtonArray[1];
 buttonObj->iButtonControl->SetButtonFlags(0);
-TInt col = 0;
+if (!AknLayoutUtils::LayoutMirrored())
-if ( !landScape )
+{
-{
+buttonObj->iButtonId = EAknSctPageNaviNextPage;
-col = mirrored ? ( !emotionEnabled?4:3 ) : 1;
+pageButtonLayRect.LayoutRect(Rect(), AknLayoutScalable_Avkon::bg_button_pane_cp11(pageVariate));
 }
 else
 {
-col = mirrored ? ( !emotionEnabled?6:5 ) : 1;
+buttonObj->iButtonId = EAknSctPageNaviPrevPage;
-}
+pageButtonLayRect.LayoutRect(Rect(), AknLayoutScalable_Avkon::bg_button_pane_cp10(pageVariate));
-pageButtonLayRect.LayoutRect( Rect(), AknLayoutScalable_Avkon::cell_graphic2_control_pane(cellVar,col) );
+}
-buttonLayRect.LayoutRect( pageButtonLayRect.Rect(), AknLayoutScalable_Avkon::bg_button_pane_cp05(bgVar));
+rect = pageButtonLayRect.Rect();
-rect = buttonLayRect.Rect();
 buttonObj->iButtonControl->SetRect(rect);
 buttonObj->iButtonControl->SetHighlightRect(rect);
+buttonObj->iButtonControl->SetIconScaleMode(EAspectRatioPreserved);
-// ...Prev button icon
-TAknLayoutRect iconLayRect;
-iconLayRect.LayoutRect(rect, AknLayoutScalable_Avkon::cell_graphic2_control_pane_g1(bgVar));
-TSize iconSize = iconLayRect.Rect().Size();
 buttonObj->iButtonControl->SetIconSize(iconSize);
-// Next button
-buttonObj = iButtonArray[2];
-buttonObj->iButtonControl->SetButtonFlags(0);
-if ( !landScape )
-{
-col = mirrored ? 1 : ( !emotionEnabled?4:3 );
-}
-else
-{
-col = mirrored ? 1 : ( !emotionEnabled?6:5 );
-}
-pageButtonLayRect.LayoutRect( Rect(), AknLayoutScalable_Avkon::cell_graphic2_control_pane(cellVar,col) );
-buttonLayRect.LayoutRect( pageButtonLayRect.Rect(), AknLayoutScalable_Avkon::bg_button_pane_cp05(bgVar));
-rect = buttonLayRect.Rect();
-buttonObj->iButtonControl->SetRect(rect);
-buttonObj->iButtonControl->SetHighlightRect(rect);
-// ...Next button icon
-buttonObj->iButtonControl->SetIconSize(iconSize);
-// Exit button
-buttonObj = iButtonArray[0];
-buttonObj->iButtonControl->SetButtonFlags(0);
-pageButtonLayRect.LayoutRect( Rect(), AknLayoutScalable_Avkon::cell_graphic2_control_pane(cellVar,0) );
-buttonLayRect.LayoutRect( pageButtonLayRect.Rect(), AknLayoutScalable_Avkon::bg_button_pane_cp05(bgVar));
-rect = buttonLayRect.Rect();
-buttonObj->iButtonControl->SetRect(rect);
-buttonObj->iButtonControl->SetHighlightRect(rect);
-// ...Exit button icon
-buttonObj->iButtonControl->SetIconSize(iconSize);
-// Emotion/Special-char button
-col = landScape? 6 : 4;
-pageButtonLayRect.LayoutRect( Rect(), AknLayoutScalable_Avkon::cell_graphic2_control_pane(cellVar,col) );
-buttonLayRect.LayoutRect( pageButtonLayRect.Rect(), AknLayoutScalable_Avkon::bg_button_pane_cp05(bgVar));
-rect = buttonLayRect.Rect();
-for ( TInt i = 3; i < iButtonArray.Count();i++ )
-{
-buttonObj = iButtonArray[i];
-buttonObj->iButtonControl->SetButtonFlags(0);
-buttonObj->iButtonControl->SetRect(rect);
-buttonObj->iButtonControl->SetHighlightRect(rect);
-// ...its icon
-buttonObj->iButtonControl->SetIconSize(iconSize);
-}
-TRAP_IGNORE(UpdateNextTableButtonL());
 // Page text.
-col = landScape? 3 : 2;
+TRect parentRect = Rect();
-pageButtonLayRect.LayoutRect(Rect(), AknLayoutScalable_Avkon::cell_graphic2_control_pane(cellVar,col));
+AknLayoutUtils::LayoutLabel(iTitle, parentRect, AknLayoutScalable_Avkon::graphic2_pages_pane_t1(pageVariate).LayoutLine());
-TAknTextComponentLayout textlayout = AknLayoutScalable_Avkon::cell_graphic2_control_pane_t1();
-TRect titleRect( pageButtonLayRect.Rect() );
-if ( !emotionEnabled )
-{
-// start complex dynamic logic to locate title rect when emotion is unable
-TInt orientation = mirrored ? -1 : 1;
-TInt newLeft = titleRect.iTl.iX + orientation*rect.Width()/2;
-TPoint titlePoint( newLeft, titleRect.iTl.iY );
-titleRect.SetRect( titlePoint, titleRect.Size() );
-}
-AknLayoutUtils::LayoutLabel(iTitle, titleRect, textlayout.LayoutLine());
 // Page text color
 TAknLayoutText textLayout;
-textLayout.LayoutText( titleRect, textlayout );
+textLayout.LayoutText(parentRect, AknLayoutScalable_Avkon::graphic2_pages_pane_t1(pageVariate));
+TRect textRect = textLayout.TextRect();
 TRgb color = textLayout.Color();
 MAknsSkinInstance* skin = AknsUtils::SkinInstance();
 if (skin)
 {
 (void)AknsUtils::GetCachedColor(skin, color, KAknsIIDQsnTextColors, EAknsCIQsnTextColorsCG6);
 TRAP_IGNORE(UpdatePageTitleL());
 }
 void CAknSctPageNavi::UpdatePageTitleL() const
 {
-TInt pages = iCharMap->PageCount();
-if ( pages < 2 )
-{
-iTitle->MakeVisible( EFalse );
-return;
-}
 CArrayFix<TInt>* numbers = new(ELeave)CArrayFixFlat<TInt>(2);
-CleanupStack::PushL( numbers );
+CleanupStack::PushL(numbers);
-numbers->AppendL( iCharMap->CurrentPage() );
+numbers->AppendL(iCharMap->CurrentPage());
-numbers->AppendL( pages );
+numbers->AppendL(iCharMap->PageCount());
 HBufC* page =
 StringLoader::LoadL(
 R_AVKON_SPECIAL_CHARACTERS_PAGE_INDICATOR, *numbers, iEikonEnv);
 CleanupStack::PopAndDestroy(); // numbers
 iTitle->SetTextL(page->Des());
 return this;
 }
 TBool CAknSctPageNavi::EnterControl(TInt aX, TInt /*aY*/)
 {
-// Note, the button index is fixed on spite of mirrored case
 if (IsVisible())
 {
 if ((aX >= 0) && (aX < iButtonArray.Count()))
 {
 CAknSctNaviButton* buttonObj;
 buttonObj = iButtonArray[iButtonIndex];
 buttonObj->SetFocused(EFalse);
 TInt index = aX;
+if (AknLayoutUtils::LayoutMirrored()) // reverse.
+{
+index = iButtonArray.Count() - 1 - aX;
+}
 buttonObj = iButtonArray[index];
 if (buttonObj->IsEnabled())
 {
 iButtonIndex = index;
 iExtension->iFocusHandler = this;
 }
 }
 return EFalse;
 }
-void CAknSctPageNavi::MoveFocus(TInt aX, TInt aY )
+void CAknSctPageNavi::MoveFocus(TInt aX, TInt /*aY*/)
 {
-(void)aX;
+TInt delta = aX;
-(void)aY;
+TInt buttonIndex = iButtonIndex + delta;
-}
+for (TInt i = 0; i < iButtonArray.Count(); i++)
+{
-void CAknSctPageNavi::MoveFocus(TBool aInternalMove, TInt aX, TInt aY )
+if (buttonIndex > iButtonArray.Count() - 1) // Next control.
 {
-if ( aInternalMove )
+if (!AknLayoutUtils::LayoutMirrored())
 {
-EnterControl( aX, 0 );
+if (!Layout_Meta_Data::IsLandscapeOrientation())
-}
+{
-else
+// First table button.
-{
+if (iExtension->iTableNavi &&
-if (iExtension->EnterControl( aX, aY ) )
+iExtension->iTableNavi->EnterControl(0,0))
 {
 LeaveControl();
-}
+break;
+}
+}
+else
+{
+// First radio button.
+if (iExtension->iRadioButton &&
+iExtension->iRadioButton->EnterControl(0,0))
+{
+LeaveControl();
+break;
+}
+// Grid start.
+TInt yPos = iCharMap->ColMin(0);
+if (iExtension->EnterControl(iCharMap->RowMin(yPos),yPos))
+{
+LeaveControl();
+break;
+}
+}
+}
+else
+{
+if (!Layout_Meta_Data::IsLandscapeOrientation())
+{
+// Grid end.
+TInt yPos = iCharMap->ColMax(0);
+if (iExtension->EnterControl(iCharMap->RowMax(yPos),yPos))
+{
+LeaveControl();
+break;
+}
+}
+else
+{
+// Last table button.
+TInt xPos = iCharMap->TableCount() - 1;
+if (iExtension->iTableNavi &&
+iExtension->iTableNavi->EnterControl(xPos,0))
+{
+LeaveControl();
+break;
+}
+}
+}
+break;
+}
+else if (buttonIndex < 0) // Prev control
+{
+if (!AknLayoutUtils::LayoutMirrored())
+{
+if (!Layout_Meta_Data::IsLandscapeOrientation())
+{
+// Grid end.
+TInt yPos = iCharMap->ColMax(0);
+if (iExtension->EnterControl(iCharMap->RowMax(yPos),yPos))
+{
+LeaveControl();
+break;
+}
+}
+else
+{
+// Last table button.
+if (iExtension->iTableNavi &&
+iExtension->iTableNavi->EnterControl(iCharMap->TableCount()-1,0))
+{
+LeaveControl();
+break;
+}
+}
+}
+else
+{
+if (!Layout_Meta_Data::IsLandscapeOrientation())
+{
+// First table button.
+if (iExtension->iTableNavi &&
+iExtension->iTableNavi->EnterControl(0,0))
+{
+LeaveControl();
+break;
+}
+}
+else
+{
+// Grid start.
+TInt yPos = iCharMap->ColMin(0);
+if (iExtension->EnterControl(iCharMap->RowMin(yPos),yPos))
+{
+LeaveControl();
+break;
+}
+}
+}
+}
+if (iButtonArray[buttonIndex]->IsEnabled()) // This control
+{
+CAknSctNaviButton* buttonObj;
+buttonObj = iButtonArray[iButtonIndex];
+buttonObj->SetFocused(EFalse);
+iButtonIndex = buttonIndex;
+buttonObj = iButtonArray[iButtonIndex];
+buttonObj->SetFocused(ETrue);
+break;
+}
+buttonIndex += (delta < 0) ? -1 : 1;
 }
 }
 TBool CAknSctPageNavi::LeaveControl()
 {
 return ETrue;
 }
 TBool CAknSctPageNavi::ExitWithKey(TInt /*aKeycode*/)
 {
-if (iButtonArray[iButtonIndex]->iButtonId != EAknSctTableNaviExit)
+return EFalse;
-{
-return EFalse;
-}
-else
-{
-return ETrue;
-}
-}
-void CAknSctPageNavi::TableExitL()
-{
-if(!iIdle)
-{
-iIdle = CIdle::NewL(CActive::EPriorityStandard);
-}
-iIdle->Cancel();
-iIdle->Start(TCallBack(TableExitCallBackL, this));
-}
-TInt CAknSctPageNavi::TableExitCallBackL(TAny* aThis)
-{
-((CAknSctPageNavi*)aThis)->DoTableExitL();
-return KErrNone;
-}
-void CAknSctPageNavi::DoTableExitL()
-{
-iCharMap->SetStatusChanged(EAknCharSelectedTableExitButton);
-}
-void CAknSctPageNavi::NextTableL()
-{
-if(!iIdle)
-{
-iIdle = CIdle::NewL(CActive::EPriorityStandard);
-}
-iIdle->Cancel();
-iIdle->Start(TCallBack(NextTableCallBackL, this));
-}
-TInt CAknSctPageNavi::NextTableCallBackL(TAny* aThis)
-{
-((CAknSctPageNavi*)aThis)->DoNextTableL();
-return KErrNone;
-}
-void CAknSctPageNavi::DoNextTableL()
-{
-iCharMap->SetStatusChanged(EAknCharSelectedNextTableButton);
-}
-void CAknSctPageNavi::UpdateNextTableButtonL()
-{
-TBool isFocused = EFalse;
-// table switch buttons stay in one place.
-for(TInt index(3); index<iButtonArray.Count(); index++)
-{
-CAknSctNaviButton* buttonObj = iButtonArray[index];
-if(buttonObj->IsEnabled())
-{
-isFocused = buttonObj->IsFocused();
-}
-}
-// fresh focused button
-for (TInt index(1); index<iButtonArray.Count(); index++)
-{
-CAknSctNaviButton* buttonObj = iButtonArray[index];
-if ( index == EAknSctPageNaviPrevPage
-|| index == EAknSctPageNaviNextPage )
-{
-// No need to display Prev/Next
-if ( iCharMap->PageCount() < 2 )
-{
-buttonObj->SetEnabled(EFalse);
-}
-continue;
-}
-if (iCharMap->TableCount() > 1)
-{
-switch (iCharMap->NextTableCase())
-{
-case EAknCharMapTableSpecialChar:
-{
-TBool isShown = EFalse;
-if(iExtension->IsShowingEmotion())
-{
-isShown = (buttonObj->iButtonId==EAknSctTableNaviSpecialChar);
-}
-else
-{
-isShown = (buttonObj->iButtonId==EAknSctTableNaviEmotion);
-}
-buttonObj->SetEnabled(isShown);
-buttonObj->SetFocused(isShown && isFocused);
-if(isShown && isFocused)
-{
-iButtonIndex = index;
-}
-}
-break;
-default:
-buttonObj->SetEnabled(EFalse);
-break;
-}
-}
-else
-{
-buttonObj->SetEnabled(EFalse);
-}
-}
-}
-TInt CAknSctPageNavi::LastButton() const
-{
-TBool emotionEnable = iExtension->IsEmotionEnabled();
-if ( emotionEnable )
-{
-return iExtension->IsShowingEmotion()?EAknSctTableNaviSpecialChar:EAknSctTableNaviEmotion;
-}
-else if ( iCharMap->PageCount() < 2 && !emotionEnable )
-{
-// Only one page, must have no SC/Emotion also, left Exit only.
-return EAknSctTableNaviExit;
-}
-else
-{
-// emotion doesn't support, no SC/Emotion icon then
-TBool mirrored = AknLayoutUtils::LayoutMirrored();
-return mirrored ? EAknSctPageNaviPrevPage : EAknSctPageNaviNextPage;
-}
 }
 // ----------------------------------------------------------------------------
 // Category button class implementation
 // ----------------------------------------------------------------------------
 }
 void CAknSctCategoryButton::SetFocused(TBool aState)
 {
 iButtonControl->SetFocus(aState);
-iButtonControl->DrawDeferred();
+iButtonControl->DrawNow();
 }
+// ----------------------------------------------------------------------------
+// Radio button class implementation
+// ----------------------------------------------------------------------------
+//
+CAknSctRadioButton::CAknSctRadioButton()
+{
+}
+CAknSctRadioButton::CAknSctRadioButton(
+CAknCharMap* aCharMap,
+CAknCharMapExtension* aExtension)
+:iExtension(aExtension),
+iCharMap(aCharMap)
+{
+}
+CAknSctRadioButton::~CAknSctRadioButton()
+{
+iButtonArray.ResetAndDestroy();
+iButtonArray.Close();
+}
+TInt CAknSctRadioButton::CountComponentControls() const
+{
+return iButtonArray.Count();
+}
+CCoeControl* CAknSctRadioButton::ComponentControl( TInt aIndex ) const
+{
+if (aIndex < iButtonArray.Count())
+{
+return iButtonArray[aIndex]->iButtonControl;
+}
+return NULL;
+}
+TKeyResponse CAknSctRadioButton::OfferKeyEventL(
+const TKeyEvent& aKeyEvent,
+TEventCode /*aModifiers*/)
+{
+TKeyResponse responce = EKeyWasNotConsumed;
+TUint code=aKeyEvent.iCode;
+switch (code)
+{
+case EKeyEnter:
+case EKeyOK:
+{
+if (AknLayoutUtils::PenEnabled())
+{
+// Grid.
+TInt yPos = iCharMap->ColMin(0);
+TInt xPos = iCharMap->RowMin(yPos);
+if (iExtension->EnterControl(xPos,yPos))
+{
+CAknButton* buttonCtrlObj;
+TInt currentIndex;
+TInt newIndex;
+for (TInt index=0; index < iButtonArray.Count(); index++)
+{
+buttonCtrlObj = iButtonArray[index]->iButtonControl;
+currentIndex = buttonCtrlObj->StateIndex();
+if (index == iButtonIndex)
+{
+newIndex = KAknSctRadioOn;
+}
+else
+{
+newIndex = KAknSctRadioOff;
+}
+if (currentIndex != newIndex)
+{
+buttonCtrlObj->SetCurrentState(newIndex, ETrue);
+if (newIndex == KAknSctRadioOn)
+{
+iExtension->iCurrentCategory =
+iButtonArray[index]->iButtonId;
+iCharMap->SetStatusChanged(EAknCharChangedCategory);
+}
+}
+}
+LeaveControl();
+}
+}
+responce = EKeyWasConsumed;
+}
+break;
+case EKeyLeftArrow:
+case '4':
+{
+responce = EKeyWasConsumed;
+if (AknLayoutUtils::PenEnabled())
+{
+TInt yPos = iButtonIndex - 1;
+if (iCharMap->RowMax(yPos) < 0)
+{
+if (Layout_Meta_Data::IsLandscapeOrientation())
+{
+if (iExtension->iRadioButton)
+{
+// Right page button.
+if (iExtension->iPageNavi &&
+iExtension->iPageNavi->EnterControl(1,0))
+{
+LeaveControl();
+break;
+}
+}
+}
+// Next button up.
+MoveFocus(0,-1);
+break;
+}
+else
+{
+//Previous row end.
+TInt xPos = iCharMap->RowMax(yPos);
+if (iExtension->EnterControl(xPos,yPos))
+{
+LeaveControl();
+break;
+}
+}
+break;
+}
+// Move by grid.
+iCharMap->TakeFocus();
+TInt xPos = iCharMap->CursorPos().iX;
+TInt yPos = iCharMap->CursorPos().iY;
+if (xPos == 0)
+{
+iCharMap->MoveFocus(-1,0);
+}
+iCharMap->ShowFocus();
+}
+break;
+case EKeyRightArrow:
+case '6':
+{
+responce = EKeyWasConsumed;
+if (AknLayoutUtils::PenEnabled())
+{
+TInt yPos = iButtonIndex;
+if (iCharMap->RowMax(yPos) < 0)
+{
+// Next button down.
+MoveFocus(0,1);
+break;
+}
+else
+{
+// 1st cell in the row.
+if (iExtension->EnterControl(0,yPos))
+{
+LeaveControl();
+break;
+}
+}
+break;
+}
+// Move by grid.
+iCharMap->TakeFocus();
+TInt xPos = iCharMap->CursorPos().iX;
+TInt yPos = iCharMap->CursorPos().iY;
+if (xPos == iCharMap->RowMax(yPos))
+{
+iCharMap->MoveFocus(1,0);
+}
+iCharMap->ShowFocus();
+}
+break;
+case EKeyDownArrow:
+case '8':
+{
+MoveFocus(0, 1);
+responce = EKeyWasConsumed;
+}
+break;
+case EKeyUpArrow:
+case '2':
+{
+MoveFocus(0,-1);
+responce = EKeyWasConsumed;
+}
+break;
+default:
+break;
+}
+return responce;
+}
+void CAknSctRadioButton::ConstructFromResourceL(TResourceReader& aReader)
+{
+TInt counts = aReader.ReadInt16();
+TResourceReader reader;
+TInt categorybutton_id;
+TInt sctcase_id;
+TInt resId;
+CAknSctCategoryButton* buttonObj;
+TBool allowCreation;
+for (TInt index=0; index < counts; index++)
+{
+allowCreation = EFalse;
+// button id
+categorybutton_id = aReader.ReadInt16();
+sctcase_id = aReader.ReadInt16();
+switch (categorybutton_id)
+{
+case EAknSCTCategoryButtonHalfCase:
+case EAknSCTCategoryButtonFullCase:
+allowCreation = ETrue;
+break;
+case EAknSCTCategoryButtonPicto:
+if (iExtension->iPictographsBuffer)
+{
+allowCreation = ETrue;
+}
+break;
+case EAknSCTCategoryButtonPicto1:
+case EAknSCTCategoryButtonPicto2:
+if (iExtension->iPictographsBuffer &&
+iExtension->iPictographsBufferGrouping)
+{
+allowCreation = ETrue;
+}
+break;
+default:
+break;
+}
+if (allowCreation)
+{
+// read the button resource
+resId = aReader.ReadInt32();
+iCoeEnv->CreateResourceReaderLC( reader, resId );
+// create Category button object
+buttonObj = CAknSctCategoryButton::NewL(
+*this, reader, categorybutton_id, sctcase_id);
+// Append button
+iButtonArray.Append(buttonObj);
+CleanupStack::PopAndDestroy(); // reader
+}
+else
+{
+// Skip data
+resId = aReader.ReadInt32();
+}
+}
+}
+void CAknSctRadioButton::HandlePointerEventL(const TPointerEvent& aPointerEvent)
+{
+TRect rect(Rect());
+if (AknLayoutUtils::PenEnabled() && rect.Contains(aPointerEvent.iPosition))
+{
+if (aPointerEvent.iType == TPointerEvent::EButton1Down)
+{
+CAknButton* buttonCtrlObj;
+TRect rectButton;
+TInt currentIndex;
+TInt newIndex;
+for (TInt index=0; index < iButtonArray.Count(); index++)
+{
+buttonCtrlObj = iButtonArray[index]->iButtonControl;
+rectButton = buttonCtrlObj->Rect();
+currentIndex = buttonCtrlObj->StateIndex();
+if (rectButton.Contains(aPointerEvent.iPosition))
+{
+newIndex = KAknSctRadioOn;
+}
+else
+{
+newIndex = KAknSctRadioOff;
+}
+if (currentIndex != newIndex)
+{
+buttonCtrlObj->SetCurrentState(newIndex, ETrue);
+if (newIndex == KAknSctRadioOn)
+{
+if (AknLayoutUtils::PenEnabled())
+{
+iButtonIndex = index;
+}
+iExtension->iCurrentCategory =
+iButtonArray[index]->iButtonId;
+iCharMap->SetStatusChanged(EAknCharChangedCategory);
+}
+}
+}
+}
+else if (aPointerEvent.iType == TPointerEvent::EDrag)
+{
+}
+else if (aPointerEvent.iType == TPointerEvent::EButton1Up)
+{
+}
+}
+else
+{
+CCoeControl::HandlePointerEventL(aPointerEvent);
+}
+}
+TSize CAknSctRadioButton::MinimumSize()
+{
+TAknLayoutRect oneButtonLayRect;
+if (!AknLayoutUtils::PenEnabled())
+{
+TAknLayoutScalableParameterLimits charMapDialogVariety =
+AknLayoutScalable_Avkon::popup_grid_graphic_window_ParamLimits();
+// Main pane without softkeys
+TRect mainPaneRect;
+if(!AknLayoutUtils::LayoutMetricsRect(
+AknLayoutUtils::EPopupParent, mainPaneRect))
+{
+mainPaneRect = iAvkonAppUi->ClientRect();
+}
+// Calc the variety
+TInt maxVariety = charMapDialogVariety.LastVariety();
+TAknLayoutRect popupGridLayRect;
+popupGridLayRect.LayoutRect(mainPaneRect,
+AknLayoutScalable_Avkon::popup_grid_graphic_window(maxVariety));
+// Calculate the size relatively
+TRect relativeDialog(TPoint(0,0),popupGridLayRect.Rect().Size());
+// Get the layout of the actual character grid with scrollbar
+TAknLayoutRect gridWithScrollLayRect;
+gridWithScrollLayRect.LayoutRect(relativeDialog,
+AknLayoutScalable_Avkon::listscroll_popup_graphic_pane());
+TAknLayoutRect categoryButtonLayRect;
+categoryButtonLayRect.LayoutRect(gridWithScrollLayRect.Rect(),
+AknLayoutScalable_Avkon::grid_sct_catagory_button_pane());
+oneButtonLayRect.LayoutRect(categoryButtonLayRect.Rect(),
+AknLayoutScalable_Avkon::cell_sct_catagory_button_pane());
+}
+else
+{
+TAknLayoutRect popupGridLayRect;
+popupGridLayRect.LayoutRect(iAvkonAppUi->ApplicationRect(),
+AknLayoutScalable_Avkon::popup_grid_graphic2_window(0));
+TAknLayoutRect oneButtonLayRect;
+TAknLayoutRect categoryButtonLayRect;
+if (!Layout_Meta_Data::IsLandscapeOrientation())
+{
+oneButtonLayRect.LayoutRect(popupGridLayRect.Rect(),
+AknLayoutScalable_Avkon::grid_graphic2_control_pane(4));
+categoryButtonLayRect.LayoutRect(popupGridLayRect.Rect(),
+AknLayoutScalable_Avkon::grid_graphic2_catg_pane(0));
+}
+else
+{
+oneButtonLayRect.LayoutRect(popupGridLayRect.Rect(),
+AknLayoutScalable_Avkon::grid_graphic2_control_pane(5));
+categoryButtonLayRect.LayoutRect(popupGridLayRect.Rect(),
+AknLayoutScalable_Avkon::grid_graphic2_catg_pane(1));
+}
+}
+TSize size(oneButtonLayRect.Rect().Width(),
+oneButtonLayRect.Rect().Height() * iButtonArray.Count());
+return size;
+}
+void CAknSctRadioButton::SizeChanged()
+{
+TRect base;
+if (!AknLayoutUtils::PenEnabled())
+{
+TAknLayoutScalableParameterLimits charMapDialogVariety =
+AknLayoutScalable_Avkon::popup_grid_graphic_window_ParamLimits();
+// Main pane without softkeys
+TRect mainPaneRect;
+if(!AknLayoutUtils::LayoutMetricsRect(
+AknLayoutUtils::EPopupParent, mainPaneRect))
+{
+mainPaneRect = iAvkonAppUi->ClientRect();
+}
+// Calc the variety
+TInt maxVariety = charMapDialogVariety.LastVariety();
+TAknLayoutRect popupGridLayRect;
+popupGridLayRect.LayoutRect(mainPaneRect,
+AknLayoutScalable_Avkon::popup_grid_graphic_window(maxVariety));
+// Calculate the size relatively
+TRect relativeDialog(TPoint(0,0), popupGridLayRect.Rect().Size());
+// Get the layout of the actual character grid with scrollbar
+TAknLayoutRect gridWithScrollLayRect;
+gridWithScrollLayRect.LayoutRect(relativeDialog,
+AknLayoutScalable_Avkon::listscroll_popup_graphic_pane());
+TAknLayoutRect categoryButtonLayRect;
+categoryButtonLayRect.LayoutRect(gridWithScrollLayRect.Rect(),
+AknLayoutScalable_Avkon::grid_sct_catagory_button_pane());
+TAknLayoutRect oneButtonLayRect;
+oneButtonLayRect.LayoutRect(categoryButtonLayRect.Rect(),
+AknLayoutScalable_Avkon::cell_sct_catagory_button_pane());
+base = oneButtonLayRect.Rect();
+}
+else
+{
+TAknLayoutRect popupGridLayRect;
+popupGridLayRect.LayoutRect(iAvkonAppUi->ApplicationRect(),
+AknLayoutScalable_Avkon::popup_grid_graphic2_window(0));
+TAknLayoutRect oneButtonLayRect;
+TAknLayoutRect categoryButtonLayRect;
+if ( !Layout_Meta_Data::IsLandscapeOrientation() )
+{
+oneButtonLayRect.LayoutRect(popupGridLayRect.Rect(),
+AknLayoutScalable_Avkon::grid_graphic2_control_pane(4));
+categoryButtonLayRect.LayoutRect(popupGridLayRect.Rect(),
+AknLayoutScalable_Avkon::grid_graphic2_catg_pane(0));
+}
+else
+{
+oneButtonLayRect.LayoutRect(popupGridLayRect.Rect(),
+AknLayoutScalable_Avkon::grid_graphic2_control_pane(5));
+categoryButtonLayRect.LayoutRect(popupGridLayRect.Rect(),
+AknLayoutScalable_Avkon::grid_graphic2_catg_pane(1));
+}
+base.iTl = categoryButtonLayRect.Rect().iTl;
+base.SetSize(oneButtonLayRect.Rect().Size());
+}
+if (iButtonArray.Count() > 0)
+{
+CAknButton* buttonCtrlObj;
+TMargins8 margins;
+margins.iTop = 1;
+margins.iBottom = 0;
+margins.iLeft = 0;
+margins.iRight = 0;
+// Change the size of buttons
+for (TInt index=0; index < iButtonArray.Count(); index++)
+{
+buttonCtrlObj = iButtonArray[index]->iButtonControl;
+if (buttonCtrlObj)
+{
+if (AknLayoutUtils::PenEnabled())
+{
+buttonCtrlObj->SetHighlightRect(base);
+}
+buttonCtrlObj->SetRect( base );
+buttonCtrlObj->SetIconSize( base.Size() );
+buttonCtrlObj->SetMargins( margins );
+buttonCtrlObj->SetIconScaleMode(EAspectRatioPreserved);
+base.Move(TPoint(0, base.Size().iHeight));
+}
+}
+}
+}
+void CAknSctRadioButton::Draw(const TRect& /*aRect*/) const
+{
+// no draw
+}
+/**
+* Returns ETrue if the aFlag bitfield in iFlags is set, EFalse if it
+* is clear
+*/
+inline TInt CAknSctRadioButton::Count() const
+{
+return iButtonArray.Count();
+}
+void CAknSctRadioButton::SetCurrentCategory(TInt aCategory)
+{
+CAknSctCategoryButton* buttonObj;
+TInt status;
+for (TInt index=0; index < iButtonArray.Count(); index++)
+{
+buttonObj = iButtonArray[index];
+status = (buttonObj->iButtonId == aCategory)?
+KAknSctRadioOn : KAknSctRadioOff;
+buttonObj->iButtonControl->SetCurrentState(status, ETrue);
+}
+}
+void CAknSctRadioButton::SetValidSctCase(TInt aSctCase)
+{
+CAknSctCategoryButton* buttonObj;
+for (TInt index=0; index < iButtonArray.Count(); index++)
+{
+buttonObj = iButtonArray[index];
+if (buttonObj->iSctCaseId == aSctCase)
+{
+buttonObj->iValid = ETrue;
+break;
+}
+// Here is the special case for Half-width/Lower/Upper
+else if (buttonObj->iSctCaseId == EAknSCTHalfCase
+&& (aSctCase == EAknSCTLowerCase
+|| aSctCase == EAknSCTUpperCase)
+)
+{
+buttonObj->iValid = ETrue;
+break;
+}
+}
+}
+void CAknSctRadioButton::RemoveInvalidButton()
+{
+CAknSctCategoryButton* buttonObj;
+for (TInt index=iButtonArray.Count()-1; index >= 0; index--)
+{
+buttonObj = iButtonArray[index];
+if (!buttonObj->iValid)
+{
+if (buttonObj->iSctCaseId == EAknSCTHalfCase)
+{
+if (iButtonArray.Count() > 1)
+{
+delete buttonObj;
+iButtonArray.Remove(index);
+}
+}
+else
+{
+delete buttonObj;
+iButtonArray.Remove(index);
+}
+}
+}
+}
+CCoeControl* CAknSctRadioButton::FocusedControl()
+{
+return this;
+}
+TBool CAknSctRadioButton::EnterControl(TInt /*aX*/, TInt aY)
+{
+if (IsVisible())
+{
+if ((aY >= 0) && (aY < Count()))
+{
+if (iExtension->iHasCategoryButtonUi)
+{
+iEntryIndex = aY;
+iExtension->iFocusHandler = this;
+if (AknLayoutUtils::PenEnabled())
+{
+iButtonIndex = aY;
+CAknSctCategoryButton* buttonObj =
+iButtonArray[iButtonIndex];
+buttonObj->SetFocused(ETrue);
+}
+return ETrue;
+}
+}
+}
+return EFalse;
+}
+void CAknSctRadioButton::MoveFocus(TInt /*aX*/, TInt aY)
+{
+CAknSctCategoryButton* buttonObj;
+CAknButton* buttonCtrlObj;
+TInt buttonIndex = iButtonIndex + aY;
+if (buttonIndex > iButtonArray.Count() - 1)
+{
+if (!AknLayoutUtils::PenEnabled())
+{
+// First radio button.
+buttonIndex = 0;
+}
+else
+{
+if (!Layout_Meta_Data::IsLandscapeOrientation())
+{
+// Left page button.
+if (iExtension->iPageNavi &&
+iExtension->iPageNavi->EnterControl(0,0))
+{
+LeaveControl();
+return;
+}
+}
+else
+{
+// First table button.
+if (iExtension->iTableNavi &&
+iExtension->iTableNavi->EnterControl(0,0))
+{
+LeaveControl();
+return;
+}
+}
+}
+}
+else if (buttonIndex < 0)
+{
+if (!AknLayoutUtils::PenEnabled())
+{
+// Last radio button.
+buttonIndex = iButtonArray.Count() - 1;
+}
+else
+{
+// First table button.
+if (iExtension->iTableNavi &&
+iExtension->iTableNavi->EnterControl(0,0))
+{
+LeaveControl();
+return;
+}
+}
+}
+if (!AknLayoutUtils::PenEnabled())
+{
+buttonObj = iButtonArray[iButtonIndex];
+buttonCtrlObj = buttonObj->iButtonControl;
+buttonCtrlObj->SetCurrentState(KAknSctRadioOff, ETrue);
+iButtonIndex = buttonIndex;
+buttonObj = iButtonArray[iButtonIndex];
+buttonCtrlObj = buttonObj->iButtonControl;
+buttonCtrlObj->SetCurrentState(KAknSctRadioOn, ETrue);
+iExtension->iCurrentCategory =
+iButtonArray[buttonIndex]->iButtonId;
+iCharMap->SetStatusChanged(EAknCharChangedCategory);
+}
+else
+{
+buttonObj = iButtonArray[iButtonIndex];
+buttonObj->SetFocused(EFalse);
+iButtonIndex = buttonIndex;
+buttonObj = iButtonArray[iButtonIndex];
+buttonObj->SetFocused(ETrue);
+}
+}
+TBool CAknSctRadioButton::LeaveControl()
+{
+for (TInt i = 0; i < iButtonArray.Count(); i++ )
+{
+iButtonArray[i]->SetFocused(EFalse);
+}
+return ETrue;
+}
+TBool CAknSctRadioButton::ExitWithKey(TInt /*aKeycode*/)
+{
+return EFalse;
+}
 // ----------------------------------------------------------------------------
 // Extension class implementation
 // ----------------------------------------------------------------------------
 //
-CAknCharMapExtension::CAknCharMapExtension() : iSingleClickEnabled( iAvkonAppUi->IsSingleClickCompatible() )
+CAknCharMapExtension::CAknCharMapExtension() : iSmileyModel(this)
+,iSingleClickEnabled( iAvkonAppUi->IsSingleClickCompatible() )
 {
 iObserver = NULL;
 iPictographsBuffer = FeatureManager::FeatureSupported(KFeatureIdJapanesePicto);
 iPictographsBufferGrouping = FeatureManager::FeatureSupported(KFeatureIdJapanesePictographsGrouping);
 iKineticScrolling = CAknPhysics::FeatureEnabled();
-TRAP_IGNORE(iSmileyModel = new (ELeave) CSmileyModel(this));
+TRAP_IGNORE(iSmileyModel.LoadResourceL());
-TRAP_IGNORE(iSmileyModel->LoadResourceL());
 }
 TTypeUid::Ptr CAknCharMapExtension::MopSupplyObject(TTypeUid aId)
 {
 return MAknsControlContext::SupplyMopObject(aId, iBgContext );
 return iCharMap;
 }
 CAknCharMapExtension::~CAknCharMapExtension()
 {
-delete iSmileyModel;
 delete iCharsSmiley;
 delete iCharsQwerty;
 delete iBgContext;
+delete iRadioButton;
 delete iTitleBuf;
 delete iPageNavi;
+delete iTableNavi;
 delete iCategoryTitle;
 delete iCategoryEntry;
 delete iEntryBuf;
 }
 TBool CAknCharMapExtension::EnterControl(TInt aX, TInt aY)
 {
 if(iCharMapProxy->EnterControl(aX, aY))
 {
 iFocusHandler = this;
+iCharMapProxy->HandleFocusStatusChanged();
 return ETrue;
 }
 else
 {
 return EFalse;
 TBool CAknCharMapExtension::ExitWithKey(TInt /*aKeycode*/)
 {
 return ETrue;
 }
-void CAknCharMapExtension::SmileyStillImageLoaded(CAknSmileyIcon* aSmileyIcon)
+void CAknCharMapExtension::ThumbnailLoaded(CSmileyIcon* /*aSmileyIcon*/)
 {
-iCharMapProxy->SmileyStillImageLoaded(iSmileyModel->SmileyCode(aSmileyIcon));
+iCharMapProxy->DrawDeferred();
 }
-void CAknCharMapExtension::SmileyAnimationChanged(CAknSmileyIcon* aSmileyIcon)
+void CAknCharMapExtension::AnimationChanged(CSmileyIcon* /*aSmileyIcon*/)
 {
-iCharMapProxy->SmileyAnimationChanged(iSmileyModel->SmileyCode(aSmileyIcon));
+iCharMapProxy->DrawCursor();
-User::After(30); // for slow down the AO of this animation
 }
 TBool CAknCharMapExtension::IsEmotionEnabled() const
 {
 return iIsEnableEmotion;
 }
 TBool CAknCharMapExtension::IsShowingEmotion() const
 {
 return iIsShowingEmotion;
-}
-void CAknCharMapExtension::SwitchEmotionVisibilityL()
-{
-iIsShowingEmotion = !iIsShowingEmotion;
 }
 TBool CAknCharMapExtension::NeedEmotionSwitchIcon() const
 {
 // Emotion switch char
 return needEmotionSwitchIcon;
 }
 HBufC* CAknCharMapExtension::ReadEmotionHBufCL()
 {
-TInt smileyCount = iSmileyModel->Count();
+TInt smileyCount = iSmileyModel.Count();
 HBufC* charsSmiley = HBufC::NewL(smileyCount);
 TPtr charsSmileyPtr(charsSmiley->Des());
-for(TInt index(0); index<smileyCount; index++)
+for(TInt id(CSmileyModel::EIconSmiley); id<smileyCount; id++)
 {
-charsSmileyPtr.Append(iSmileyModel->SmileyCode(index));
+charsSmileyPtr.Append(TEmotionUtils::EmotionChar(id));
 }
 return charsSmiley;
 }
-void CAknCharMapExtension::LoadEmotionTumbnails(const TDesC& aText)
+void CAknCharMapExtension::LoadEmotionTumbnails(const TDesC& aSctChars)
 {
-//If emotion tumbbails can't be load,
+for(TInt i(0); i<aSctChars.Length(); i++)
-// no emotion tumbnail will be dispalyed.
+{
-TRAP_IGNORE( iSmileyModel->LoadStillImagesL(aText) );
+iSmileyModel.LoadThumbnailAsyn(TEmotionUtils::EmotionId(aSctChars[i]));
 }
-const TInt KAnimationRepeat = 30;
-const TInt KAnimationDelay = 150*1000;
-void CAknCharMapExtension::PlayAnimationL(const TDesC& aText)
-{
-iSmileyModel->PlayAnimationL(aText, KAnimationRepeat, KAnimationDelay);
-}
-void CAknCharMapExtension::StopAnimation(const TDesC& aText)
-{
-iSmileyModel->StopAnimation(aText);
 }
 void CAknCharMapExtension::SetEmotionSize(const TSize& aSize)
 {
 TInt unit = Min(aSize.iWidth, aSize.iHeight);
-iSmileyModel->SetSize(TSize(unit,unit));
+iSmileyModel.SetSize(TSize(unit,unit));
 }
-TBool CAknCharMapExtension::IsEmotionChar(TChar aChar)
+CSmileyIcon* CAknCharMapExtension::EmotionIcon(TChar aEmotionChar)
 {
-return iSmileyModel->IsSmiley(aChar);
+if(TEmotionUtils::IsEmotionChar(aEmotionChar))
-}
+{
+return iSmileyModel[TEmotionUtils::EmotionId(aEmotionChar)];
-TChar CAknCharMapExtension::SwitchToSctChar()
+}
-{
+else
-return iSmileyModel->SwitchToSctCode();
+{
-}
+return NULL;
+}
-TChar CAknCharMapExtension::SwitchToEmotionChar()
+}
-{
-return iSmileyModel->SwitchToSmileyCode();
+TBool CAknCharMapExtension::DrawEmotion(CWindowGc& aGc, const TRect& aRect, TChar aEmotionChar)
-}
+{
+CSmileyIcon* icon = EmotionIcon(aEmotionChar);
-CAknSmileyIcon* CAknCharMapExtension::EmotionIcon(TChar aChar)
+if(icon && icon->ReadyToDraw())
 {
-return iSmileyModel->Smiley(aChar);
+TRect iconRect(TPoint(),icon->Size());
-}
-const TDesC& CAknCharMapExtension::EmotionText(TChar aChar)
-{
-return iSmileyModel->Text(aChar);
-}
-TBool CAknCharMapExtension::DrawEmotion(CWindowGc& aGc, const TRect& aRect, CAknSmileyIcon* aSmileyIcon)
-{
-if(aSmileyIcon && aSmileyIcon->ReadyToDraw())
-{
-TRect iconRect(TPoint(),aSmileyIcon->Size());
 TInt xoffset = (aRect.Width() - iconRect.Width()) / 2;
 TInt yoffset = (aRect.Height() - iconRect.Height()) / 2;
-aGc.BitBltMasked(aRect.iTl+TPoint(xoffset,yoffset), aSmileyIcon->Image(), iconRect, aSmileyIcon->Mask(), FALSE);
+aGc.BitBltMasked(aRect.iTl+TPoint(xoffset,yoffset), icon->Image(), iconRect, icon->Mask(), FALSE);
 return ETrue;
 }
 else
 {
 return EFalse;
 const TInt KEmotionAnimationRepeatCount = 30; // 30 times
 const TInt KEmotionAnimationDelay = 150*1000; // 0.15s
 void CAknCharMapExtension::HandleFocusStatusChanged(TChar aChar, TBool aIsFocused)
 {
-CAknSmileyIcon* lastIcon = EmotionIcon(iLastFocusedSmileyChar);
+CSmileyIcon* lastIcon = EmotionIcon(iLastFocusedSmileyChar);
 if(lastIcon)
 {
 lastIcon->StopAnimation();
 }
-CAknSmileyIcon* focusedIcon = EmotionIcon(aChar);
+CSmileyIcon* focusedIcon = EmotionIcon(aChar);
 if(focusedIcon)
 {
 if(aIsFocused)
 {
 if(iHighlightVisible)
 // -----------------------------------------------------------------------------
 // CAknCharMapHistory::InsertChar()
 // Insert a character which select on SCT/Picto.
 // -----------------------------------------------------------------------------
 //
-void CAknCharMapHistory::InsertChar(THistoryType aHistoryType, const TChar aChar, TBool aIsEmotion)
+void CAknCharMapHistory::InsertChar(THistoryType aHistoryType, const TChar aChar)
 {
 __ASSERT_ALWAYS((EHistoryTypeFull<=aHistoryType && aHistoryType<EHistoryTypeMax), Panic(EAknPanicInvalidValue));
 InsertCharToHistoryBuf(iMixedHistoryArray[aHistoryType], aChar);
-if(aIsEmotion)
+if(TEmotionUtils::IsEmotionChar(aChar))
 {
 InsertCharToHistoryBuf(iEmotionHistory, aChar);
 }
 else
 {
 if(err)
 return;
 iExtension->iFlags = 0x00;
+// if feature language is Japanese
+CAknEnv* env = CAknEnv::Static();
+if (env)
+{
+if (env->IsFeatureLanguage(KFeatureIdJapanese))
+{
+iExtension->iJapaneseSctUi = ETrue;
+iExtension->iHasCategoryButtonUi = ETrue;
+}
+}
 iExtension->iFocusHandler = iExtension;
 iExtension->SetCharMapControl(this);
 if ( iExtension->iSingleClickEnabled )
 {
 iExtension->iHighlightVisible = EFalse;
 }
 delete iPictographsBuffer2;
 delete iSBFrame;
 delete iPictoInterface;
+delete iOffscreenBg;
+delete iBitmapDevice;
+delete iBitmapGc;
 delete iTitleDefault;
 delete iTitleFull;
 delete iTitleHalf;
 delete iTitlePicto;
 iSpecialCharCases.Close();
 iSpecialCharPages.Close();
 iPictographCases.Close();
 iPictographPages.Close();
 MTouchFeedback* feedback = MTouchFeedback::Instance();
+feedback->RemoveFeedbackForControl( this );
-if ( feedback != NULL )
-{
-feedback->RemoveFeedbackForControl( this );
-}
 }
 void CAknCharMap::DoLayout()
 {
 TAknTextLineLayout specialCharItemLayout;
 {
 if ( Layout_Meta_Data::IsLandscapeOrientation() )
 {
 specialCharItemLayout =
 AknLayoutScalable_Avkon::cell_graphic2_pane_t1(1);
+}
+else if (IsJapaneseSctUi())
+{
+specialCharItemLayout =
+AknLayoutScalable_Avkon::cell_graphic2_pane_t1(2);
 }
 else
 {
 specialCharItemLayout =
 AknLayoutScalable_Avkon::cell_graphic2_pane_t1(0);
 iIsMirrored = AknLayoutUtils::LayoutMirrored();
 iDrawnBefore = EFalse;
 CountMaxColumnsAndCellSizes();
 SizeChanged();
-// set smiley size
+// load Emotion icon resource, but not load images
-TAknWindowComponentLayout cellGraphicsLayout;
+TSize iconSize(iGridItemWidth,iGridItemHeight);
-if ( Layout_Meta_Data::IsLandscapeOrientation() )
+iconSize.iWidth = iconSize.iWidth * 2 / 3;
-{
+iconSize.iHeight = iconSize.iHeight * 2 / 3;
-cellGraphicsLayout = AknLayoutScalable_Avkon::cell_graphic2_pane_g5(1);
+Extension()->SetEmotionSize(iconSize);
-}
-else
-{
-cellGraphicsLayout = AknLayoutScalable_Avkon::cell_graphic2_pane_g5(0);
-}
-TAknLayoutRect cellGraphicsRect;
-cellGraphicsRect.LayoutRect(TRect(TSize(iGridItemWidth,iGridItemHeight)), cellGraphicsLayout);
-Extension()->SetEmotionSize(cellGraphicsRect.Rect().Size());
 }
 EXPORT_C void CAknCharMap::ConstructFromResourceL(TResourceReader& aReader)
 {
 }
 // Alternate components.
 if (AknLayoutUtils::PenEnabled())
 {
+if (iExtension->iHasCategoryButtonUi)
+{
+EnableCategoryInputFieldL();
+EnableCategoryButtonsL();
+}
 EnableNavigationButtonsL();
+}
+else
+{
+if (iExtension->iHasCategoryButtonUi)
+{
+EnableCategoryButtonsL();
+}
 }
 // Offscreen background.
 if (offscreen)
 {
 else
 {
 iShowCasesRef = &iSpecialCharCases;
 iShowPagesRef = &iSpecialCharPages;
+// default
+iSpecialCharCase = EAknSCTLowerCase;
+iChars = iCharsBufferLower;
 if(iExtension->iCharsSmiley && iExtension->IsShowingEmotion())
 {
 iChars = iExtension->iCharsSmiley;
 }
 else if (iCharsBufferUpper && iSpecialCharCase==EAknSCTUpperCase)
 iChars = iCharsBufferHalf;
 }
 else if (iExtension->iCharsQwerty && iSpecialCharCase==EAknSCTQwerty)
 {
 iChars = iExtension->iCharsQwerty;
-}
-else
-{
-iSpecialCharCase = EAknSCTLowerCase;
-iChars = iCharsBufferLower;
 }
 }
 // calculate page count for all pages
 iSpecialCharPages.Reset(); // reset the current page count for different charsets
 {
 iCursorPos = TPoint(0, 1);
 }
 iExtension->iCurrentCategory = Category();
+if (iExtension->iRadioButton)
+{
+iExtension->iRadioButton->SetCurrentCategory(iExtension->iCurrentCategory);
+}
 // Create and set the scb visible even though there is nothing to scroll
 delete iSBFrame;
 iSBFrame=NULL;
 iSBFrame->SetScrollBarVisibilityL(CEikScrollBarFrame::EOff,CEikScrollBarFrame::EAuto);
 iSBFrame->VerticalScrollBar()->SetMopParent(iExtension);
 UpdateScrollIndicatorL();
 }
-Extension()->LoadEmotionTumbnails(*iChars);
+iExtension->LoadEmotionTumbnails(*iChars);
+CAknSctPageNavi* pageNavi = Extension()->iPageNavi;
+if(pageNavi)
+{
+pageNavi->MakeVisible(PageCount()>1);
+}
+HandleFocusStatusChanged();
 }
 EXPORT_C void CAknCharMap::SetBuffer(TDes& aSpecialChars)
 {
 {
 return EKeyWasConsumed;
 }
 TUint code=aKeyEvent.iCode;
 // First key event enables the highlight
 if ( iExtension->iSingleClickEnabled && !iExtension->iHighlightVisible )
 {
 if ( code == EKeyUpArrow || code == EKeyDownArrow ||
 code == EKeyLeftArrow || code == EKeyRightArrow ||
 code == EKeyEnter )
 {
-iExtension->iKeyBrdEvent = ETrue;
 iExtension->iHighlightVisible = ETrue;
-if ( LengthOfRecentChar() == 0 && CurrentPage() == 1 )
+iCursorPos = TPoint( 0, 0 );
-	{
-iCursorPos = TPoint( 0, 1 );
-	}
-else
-	{
-iCursorPos = TPoint( 0, 0 );
-	}
 DrawCursor();
+HandleFocusStatusChanged();
 return EKeyWasConsumed;
 }
 }
 switch (code)
 {
 case EKeyLeftArrow:
 case '4':
 {
+if (iExtension->iRadioButton && (iCursorPos.iX == 0)) // Radio button.
+{
+if (iExtension->iRadioButton->EnterControl(iCursorPos.iX,iCursorPos.iY))
+{
+LeaveControl();
+break;
+}
+}
 if (AknLayoutUtils::PenEnabled())
 {
 if (!iIsMirrored)
 {
 if ((iCursorPos.iX == 0) && (iCursorPos.iY == ColMin(0)))
 {
-// western, move left from first one in grid, focus pageNavi last button
+if (!Layout_Meta_Data::IsLandscapeOrientation())
-if ( iExtension->iPageNavi )
 {
-TInt maxButt = iExtension->iPageNavi->LastButton();
+// Last table button.
-if ( iExtension->iPageNavi->EnterControl( maxButt,0 ) )
+if (iExtension->iTableNavi &&
+iExtension->iTableNavi->EnterControl(TableCount() - 1,0))
+{
+LeaveControl();
+break;
+}
+}
+else
+{
+// Right page button.
+if (iExtension->iPageNavi &&
+iExtension->iPageNavi->EnterControl(1,0))
 {
 LeaveControl();
 break;
 }
 }
 }
 else
 {
 if (((iCursorPos.iY == ColMax(0)) && (iCursorPos.iX == RowMax(ColMax(0)))))
 {
-// mirrored, move left from last one in grid, focus pgNavi first button
+if (!Layout_Meta_Data::IsLandscapeOrientation())
+{
+// Left page button.
+if (iExtension->iPageNavi &&
+iExtension->iPageNavi->EnterControl(0,0))
+{
+LeaveControl();
+break;
+}
+}
+else
+{
+// First table button.
+if (iExtension->iTableNavi &&
+iExtension->iTableNavi->EnterControl(0,0))
+{
+LeaveControl();
+break;
+}
+}
+}
+}
+}
+MoveFocus(-1,0);
+break;
+}
+case EKeyRightArrow:
+case '6':
+{
+if (iExtension->iRadioButton &&
+(iCursorPos.iX == RowMax(iCursorPos.iY)) &&
+(iCursorPos.iY <= (iExtension->iRadioButton->Count() - 2)))
+{
+// Radio button.
+if (iExtension->iRadioButton->EnterControl(iCursorPos.iX,iCursorPos.iY+1))
+{
+LeaveControl();
+break;
+}
+}
+if (AknLayoutUtils::PenEnabled())
+{
+if (!iIsMirrored)
+{
+if ((iCursorPos.iY == ColMax(0)) &&
+(iCursorPos.iX == RowMax(ColMax(0))))
+{
+if (!Layout_Meta_Data::IsLandscapeOrientation())
+{
+// Left page button.
+if (iExtension->iPageNavi &&
+iExtension->iPageNavi->EnterControl(0,0))
+{
+LeaveControl();
+break;
+}
+}
+else
+{
+// First table button.
+if (iExtension->iTableNavi &&
+iExtension->iTableNavi->EnterControl(0,0))
+{
+LeaveControl();
+break;
+}
+}
+}
+}
+else
+{
+if ((iCursorPos.iY == ColMin(0)) &&
+(iCursorPos.iX == 0))
+{
+if (!Layout_Meta_Data::IsLandscapeOrientation())
+{
+// First table button.
+if (iExtension->iTableNavi &&
+iExtension->iTableNavi->EnterControl(0,0))
+{
+LeaveControl();
+break;
+}
+}
+else
+{
+// Left page button.
+if (iExtension->iPageNavi &&
+iExtension->iPageNavi->EnterControl(1,0))
+{
+LeaveControl();
+break;
+}
+}
+}
+}
+}
+MoveFocus(1,0);
+break;
+}
+case EKeyUpArrow:
+case '2':
+{
+if (AknLayoutUtils::PenEnabled())
+{
+if (iCursorPos.iY == ColMin(iCursorPos.iX))
+{
+if (!iExtension->iRadioButton && iCursorPos.iX < TableCount())
+{
+// Table button up.
+if ( iExtension->iTableNavi &&
+iExtension->iTableNavi->EnterControl(iCursorPos.iX,0))
+{
+LeaveControl();
+break;
+}
+}
+else
+{
+if (iCursorPos.iX == MaxCols() - 1)
+{
+// Right page button.
+if ( iExtension->iPageNavi &&
+iExtension->iPageNavi->EnterControl(1,0))
+{
+LeaveControl();
+break;
+}
+}
+if (Layout_Meta_Data::IsLandscapeOrientation())
+{
+if ((!iExtension->iRadioButton &&
+(iCursorPos.iX == TableCount())) ||
+((iExtension->iRadioButton) &&
+(iCursorPos.iX == MaxCols()-2)))
+{
+// Left page button.
+if ( iExtension->iPageNavi &&
+iExtension->iPageNavi->EnterControl(0,0))
+{
+LeaveControl();
+break;
+}
+}
+}
+// Grid bottom row.
+if (ColMax(0) > ColMax(iCursorPos.iX))
+{
+EnterControl(RowMax(ColMax(0)), ColMax(0));
+break;
+}
+EnterControl(iCursorPos.iX, ColMax( iCursorPos.iX));
+break;
+}
+}
+}
+MoveFocus(0,-1);
+break;
+}
+case EKeyDownArrow:
+case '8':
+{
+if (AknLayoutUtils::PenEnabled())
+{
+if (iCursorPos.iY == ColMax(iCursorPos.iX))
+{
+if (iCursorPos.iX > RowMax(ColMax(0)))
+{
+// Grid last item.
+EnterControl(RowMax(ColMax(0)), ColMax(0));
+break;
+}
+if ((iCursorPos.iX == MaxCols() - 1) ||
+(!Layout_Meta_Data::IsLandscapeOrientation() &&
+iExtension->iRadioButton &&
+(iCursorPos.iX == MaxCols() - 2)))
+{
+// Right page button.
+if (iExtension->iPageNavi &&
+iExtension->iPageNavi->EnterControl(1,0))
+{
+LeaveControl();
+break;
+}
+}
+if ((Layout_Meta_Data::IsLandscapeOrientation() &&
+!iExtension->iRadioButton &&
+(iCursorPos.iX == TableCount())) ||
+(!Layout_Meta_Data::IsLandscapeOrientation() &&
+(iCursorPos.iX == 0)) ||
+(Layout_Meta_Data::IsLandscapeOrientation() &&
+iExtension->iRadioButton &&
+(iCursorPos.iX == MaxCols() - 2)))
+{
+// Left page button.
 if (iExtension->iPageNavi &&
 iExtension->iPageNavi->EnterControl(0,0))
 {
 LeaveControl();
 break;
 }
 }
-}
+if (!iExtension->iRadioButton &&
-}
+iCursorPos.iX < TableCount())
-MoveFocus(-1,0);
-break;
-}
-case EKeyRightArrow:
-case '6':
-{
-if (AknLayoutUtils::PenEnabled())
-{
-if (!iIsMirrored)
-{
-if ((iCursorPos.iY == ColMax(0)) &&
-(iCursorPos.iX == RowMax(ColMax(0))))
 {
-// western, move right from last one in grid, focus pgNavi first button
+// Table button down.
-if (iExtension->iPageNavi &&
+if (iExtension->iTableNavi &&
-iExtension->iPageNavi->EnterControl(0,0))
+iExtension->iTableNavi->EnterControl(iCursorPos.iX,0))
 {
 LeaveControl();
 break;
 }
 }
-}
-else
-{
-if ((iCursorPos.iY == ColMin(0)) &&
-(iCursorPos.iX == 0))
-{
-// mirrored, move right from first one in grid, focus pgNavi last button
-if ( iExtension->iPageNavi )
-{
-TInt maxButt = iExtension->iPageNavi->LastButton();
-if ( iExtension->iPageNavi->EnterControl( maxButt,0 ) )
-{
-LeaveControl();
-break;
-}
-}
-}
-}
-}
-MoveFocus(1,0);
-break;
-}
-case EKeyUpArrow:
-case '2':
-{
-if (AknLayoutUtils::PenEnabled())
-{
-if ( iCursorPos.iY == ColMin(iCursorPos.iX) )
-{
-// cell is at the top row, need to go on to PageNavi
-if ( iExtension->iPageNavi )
-{
-TInt aX = 0;
-if ( iCursorPos.iX == MaxCols() - 1 )
-{
-aX = iExtension->iPageNavi->LastButton();
-}
-else if ( iCursorPos.iX == MaxCols() - 2 )
-{
-// a bit complex as unable-emotion SCT has no SC/Emotion icon
-if ( iExtension->IsEmotionEnabled() )
-{
-aX = iIsMirrored? 1 : 2;
-}
-else
-{
-aX = -1;
-}
-}
-else if (iCursorPos.iX == 1 )
-{
-aX = iIsMirrored? 2 : 1;
-}
-else if ( iCursorPos.iX == 0 )
-{
-// first button in PageNavi
-aX = 0;
-}
-else
-{
-aX = -1;
-}
-if ( iExtension->iPageNavi->EnterControl( aX,0 ) )
-{
-LeaveControl();
-break;
-}
-}
-EnterControl(iCursorPos.iX, ColMax( iCursorPos.iX));
-break;
-}
-}
-MoveFocus(0,-1);
-break;
-}
-case EKeyDownArrow:
-case '8':
-{
-if (AknLayoutUtils::PenEnabled())
-{
-if (iCursorPos.iY == ColMax(iCursorPos.iX))
-{
-if (  iExtension->iPageNavi )
-{
-TInt aX = 0;
-if ( iCursorPos.iX == MaxCols() - 1 )
-{
-aX = iExtension->iPageNavi->LastButton();
-}
-else if ( iCursorPos.iX == MaxCols() - 2 )
-{
-// a bit complex as unable-emotion SCT has no SC/Emotion icon
-if ( iExtension->IsEmotionEnabled() )
-{
-aX = iIsMirrored? 1 : 2;
-}
-else
-{
-aX = -1;
-}
-}
-else if ( iCursorPos.iX == 1 )
-{
-aX = iIsMirrored? 2 : 1;
-}
-else if ( iCursorPos.iX == 0 )
-{
-// default: first button in PageNavi
-aX = 0;
-}
-else
-{
-aX = -1;
-}
-if ( iExtension->iPageNavi->EnterControl( aX,0 ) )
-{
-LeaveControl();
-break;
-}
-}
-// cell is at bottom row
-if (iCursorPos.iX > RowMax(ColMax(0)))
-{
-// Grid last item.
-EnterControl(RowMax(ColMax(0)), ColMax(0));
-break;
-}
 // Grid top row.
 EnterControl(iCursorPos.iX, ColMin(iCursorPos.iX));
 break;
 }
 }
 TAknLayoutRect gridWithScrollLayRect;
 gridWithScrollLayRect.LayoutRect(relativePopup, AknLayoutScalable_Avkon::listscroll_popup_graphic_pane());
 TAknLayoutRect gridLayRect;
-gridLayRect.LayoutRect(gridWithScrollLayRect.Rect(), AknLayoutScalable_Avkon::grid_graphic_popup_pane(0));
+if (iExtension->iHasCategoryButtonUi)
+{
+gridLayRect.LayoutRect(gridWithScrollLayRect.Rect(), AknLayoutScalable_Avkon::grid_graphic_popup_pane(2));
+}
+else
+{
+gridLayRect.LayoutRect(gridWithScrollLayRect.Rect(), AknLayoutScalable_Avkon::grid_graphic_popup_pane(0));
+}
 // Grid.
 TRect contentRect = Extension()->iMenuSct ? Rect() : gridLayRect.Rect();
 if ( Extension()->iMenuSct )
 {
 else
 {
 iOffset.iX = contentRect.iTl.iX + 1;
 iGridTopLeft.iX = contentRect.iTl.iX;
 }
+// Category buttons.
+if (iExtension && iExtension->iHasCategoryButtonUi)
+{
+if (iExtension->iRadioButton)
+{
+TAknLayoutRect categoryButtonLayRect;
+categoryButtonLayRect.LayoutRect(gridWithScrollLayRect.Rect(),AknLayoutScalable_Avkon::grid_sct_catagory_button_pane());
+TAknLayoutRect oneButtonLayRect;
+oneButtonLayRect.LayoutRect(categoryButtonLayRect.Rect(),AknLayoutScalable_Avkon::cell_sct_catagory_button_pane());
+TSize size(oneButtonLayRect.Rect().Width(), oneButtonLayRect.Rect().Height()*iExtension->iRadioButton->Count());
+TRect rectRadio(categoryButtonLayRect.Rect().iTl, size);
+iExtension->iRadioButton->SetRect(rectRadio);
+}
+}
 // Background context.
 if(iExtension && iExtension->iBgContext)
 {
 TInt varietyNumber = Layout_Meta_Data::IsLandscapeOrientation() ? 1 : 0;
 TRAP_IGNORE( UpdateScrollIndicatorL() );
 }
 else
 {
-TInt variety = Layout_Meta_Data::IsLandscapeOrientation() ? 7 : 6;
+TInt variety;
+if (!IsJapaneseSctUi())
+{
+variety = Layout_Meta_Data::IsLandscapeOrientation() ? 3 : 1;
+if(TableCount() > 1) variety--;
+}
+else
+{
+variety = Layout_Meta_Data::IsLandscapeOrientation() ? 5 : 4;
+}
 // Popup.
 TAknLayoutRect popupGridLayRect;
 popupGridLayRect.LayoutRect(iAvkonAppUi->ApplicationRect(), AknLayoutScalable_Avkon::popup_grid_graphic2_window(0));
 TRect popupGridRect = popupGridLayRect.Rect();
 {
 iOffset.iX = gridRect.iTl.iX + 1;
 iGridTopLeft.iX = gridRect.iTl.iX;
 }
+// Category
+if (iExtension->iHasCategoryButtonUi && iExtension->iRadioButton) // Radio buttons.
+{
+TAknLayoutRect oneButtonLayRect;
+TAknLayoutRect categoryButtonLayRect;
+TInt oneButtonLayVariety, categoryButtonLayVariety;
+if (Layout_Meta_Data::IsLandscapeOrientation())
+{
+oneButtonLayVariety = 5;
+categoryButtonLayVariety = 1;
+}
+else
+{
+oneButtonLayVariety = 4;
+categoryButtonLayVariety = 0;
+}
+oneButtonLayRect.LayoutRect(popupGridRect, AknLayoutScalable_Avkon::grid_graphic2_control_pane(oneButtonLayVariety));
+categoryButtonLayRect.LayoutRect(popupGridRect, AknLayoutScalable_Avkon::grid_graphic2_catg_pane(categoryButtonLayVariety));
+TSize size(oneButtonLayRect.Rect().Width(),
+oneButtonLayRect.Rect().Height() * iExtension->iRadioButton->Count());
+TRect rectRadio(categoryButtonLayRect.Rect().iTl, size);
+iExtension->iRadioButton->SetRect(rectRadio);
+}
+// Table navigation.
+if (iExtension->iTableNavi)
+{
+TAknLayoutRect tableNaviLayRect;
+tableNaviLayRect.LayoutRect(popupGridRect, AknLayoutScalable_Avkon::grid_graphic2_control_pane(variety));
+iExtension->iTableNavi->SetRect(tableNaviLayRect.Rect());
+}
 // Page navigation.
 if (iExtension->iPageNavi)
 {
-iExtension->iPageNavi->MakeVisible(ETrue);
+if (PageCount() > 1)
+{
-TAknLayoutRect pageNaviLayRect;
+iExtension->iPageNavi->MakeVisible(ETrue);
-pageNaviLayRect.LayoutRect(popupGridRect, AknLayoutScalable_Avkon::grid_graphic2_control_pane(variety));
-iExtension->iPageNavi->SetRect(pageNaviLayRect.Rect());
+TAknLayoutRect pageNaviLayRect;
+pageNaviLayRect.LayoutRect(popupGridRect, AknLayoutScalable_Avkon::graphic2_pages_pane(variety));
+iExtension->iPageNavi->SetRect(pageNaviLayRect.Rect());
+}
+else
+{
+iExtension->iPageNavi->MakeVisible(EFalse);
+}
 }
 // Background context.
 if(iExtension->iBgContext)
 {
 void CAknCharMap::DoHandleResourceChangeL(TInt aType)
 {
 if (aType == KEikDynamicLayoutVariantSwitch)
 {
+TInt pos = (iFirstVisibleRow + iCursorPos.iY) * iMaxColumns + iCursorPos.iX;
-SetSmileyAnimationActivityInCurrentPageL(EFalse);
+// Cursor position before layout switch.
-TInt cursorIndexBeforeSwitch = (iFirstVisibleRow + iCursorPos.iY) * iMaxColumns + iCursorPos.iX;
+TInt previousCursorPosition;
-TInt recentLengthBeforeSwitch = iMaxColumns;
+TInt previousLength = iMaxColumns;
-TBool recentWasSetBeforeSwitch = iSetRecentSct;
+if (pos < previousLength)
+{
+previousCursorPosition = pos; // recent char
+}
+else
+{
+previousCursorPosition = pos - previousLength; // grid.
+}
 // Disabled because the buffer content may change due to diffent layout.
-if (recentWasSetBeforeSwitch) DisableRecentCharsRow();
+TBool recentWasSet = iSetRecentSct;
+if (recentWasSet) DisableRecentCharsRow();
 // Calculate the new magnitudes (iMaxColumns, etc.).
 DoLayout();
 // Append right amount of recent characters due to different layout.
-if (recentWasSetBeforeSwitch) AppendRecentCharL();
+if (recentWasSet) AppendRecentCharL();
 // Sets the character case because the buffer content may have changed.
 SetCharacterCaseL(iSpecialCharCase);
-TInt cursorIndexAfterSwitch;
+// Calculates the index position of the cursor in the char table and
-if ( !iExtension->iKeyBrdEvent )
+// update the x and y positions for the new grid with it
-{
+TInt currentCursorPosition = previousCursorPosition;
-cursorIndexAfterSwitch = cursorIndexBeforeSwitch;
+TInt currentLength = iMaxColumns; // iMaxColumns may have changed.
-}
+if (pos < previousLength) // recent char
-else
+{
-{
+if (pos >= currentLength) // cannot be shown.
-// status after layout switch.
+{
-TInt recentLengthAfterSwitch = iMaxColumns; // recentLength has
+currentCursorPosition = 0;
-// changed after switch
+}
-if ( cursorIndexBeforeSwitch < recentLengthBeforeSwitch )
+}
-{
+else // grid cell
-cursorIndexAfterSwitch = cursorIndexBeforeSwitch;
+{
-}
+currentCursorPosition += currentLength;
-else
+}
-{
-cursorIndexAfterSwitch = cursorIndexBeforeSwitch -
-recentLengthBeforeSwitch + recentLengthAfterSwitch;
-}
-}
 // the new first row is the top row on the page where the new focus is.
-TInt pageVolume = iMaxColumns * iExtension->iMaxVisibleRows;
+iFirstVisibleRow = iExtension->iMaxVisibleRows *
-iFirstVisibleRow = (cursorIndexAfterSwitch / pageVolume * pageVolume) / iMaxColumns;
+(currentCursorPosition / (iMaxColumns * iExtension->iMaxVisibleRows));
-SetSmileyAnimationActivityInCurrentPageL(ETrue);
 // the cursor positions are relative to current page
-TInt cursorIndexAfterSwitchInPage = cursorIndexAfterSwitch - (iMaxColumns * iFirstVisibleRow);
+iCursorPos.iY = (currentCursorPosition -
-iCursorPos.iX = cursorIndexAfterSwitchInPage % iMaxColumns;
+(iMaxColumns * iFirstVisibleRow)) / iMaxColumns;
-iCursorPos.iY = cursorIndexAfterSwitchInPage / iMaxColumns;
+iCursorPos.iX = currentCursorPosition -
-iOldCursorPos = iCursorPos;
+(iMaxColumns * iFirstVisibleRow) - (iMaxColumns * iCursorPos.iY);
+iOldCursorPos.iY = (previousCursorPosition -
+(iMaxColumns * iFirstVisibleRow)) / iMaxColumns;
+iOldCursorPos.iX = previousCursorPosition -
+(iMaxColumns * iFirstVisibleRow) - (iMaxColumns * iOldCursorPos.iY);
 // for full screen touch UI.
 CEikDialog* dlg;
 MopGetObject(dlg);
 CEikDialogExtension* dlgExtension = dlg ? dlg->Extension() : NULL;
 dlgExtension->iPublicFlags.Clear(CEikDialogExtension::EUseVirtualInput);
 }
 }
 // Sets alternate UI controls.
-if (AknLayoutUtils::PenEnabled())
+if (iExtension->iHasCategoryButtonUi)
 {
-EnableNavigationButtonsL();
+if (AknLayoutUtils::PenEnabled())
+{
+EnableCategoryInputFieldL();
+EnableNavigationButtonsL();
+}
+else
+{
+DisableCategoryInputFieldL();
+DisableNavigationButtonsL();
+}
+EnableCategoryButtonsL();
 }
 else
 {
-DisableNavigationButtonsL();
+DisableCategoryInputFieldL();
-}
+DisableCategoryButtonsL();
+if (AknLayoutUtils::PenEnabled())
+{
+EnableNavigationButtonsL();
+}
+else
+{
+DisableNavigationButtonsL();
+}
+}
 // and finally updates the page counts (from setcasetable)
 iSpecialCharPages.Reset(); // reset the current page count for different charsets
 iSpecialCharPages.AppendL( PageCountFromChars(*iChars) );
 for (TInt i(1); i < iSpecialCharCases.Count(); ++i)
 // !resize an option but the cost only differs with the creation of the graphic objects!
 CreateOffscreenBackgroundL();
 iOffscreenBgDrawn = EFalse;
 }
-else if( aType == KAknsMessageSkinChange )
+if( aType == KAknsMessageSkinChange )
 {
 iOffscreenBgDrawn = EFalse;
 }
-else if(aType == KEikMessageFadeAllWindows) // focus gained // KEikMessageWindowsFadeChange
-{
-Extension()->iCharMapFocusGained = ETrue;
-SetSmileyAnimationActivityInCurrentPageL(ETrue);
-}
-else if(aType == KAknMessageFocusLost) // focus lost
-{
-Extension()->iCharMapFocusGained = EFalse;
-SetSmileyAnimationActivityInCurrentPageL(EFalse);
-if ( iExtension->iHighlightVisible )
-{
-iExtension->iHighlightVisible = EFalse;
-DrawCursor();
-}
-}
 }
 void CAknCharMap::EnableNavigationButtonsL()
 {
 if ( iExtension )
 {
+if ( !iExtension->iTableNavi )
+{
+iExtension->iTableNavi = new(ELeave) CAknSctTableNavi(this, iExtension);
+iExtension->iTableNavi->SetContainerWindowL(*this);
+TResourceReader reader;
+iCoeEnv->CreateResourceReaderLC(reader, R_AVKON_SCT_TABLE_NAVI_CONTROL);
+iExtension->iTableNavi->ConstructFromResourceL(reader);
+iExtension->iTableNavi->SetNonFocusing();
+iExtension->iTableNavi->SetMopParent(iExtension);
+CleanupStack::PopAndDestroy(); // reader
+}
+iExtension->iTableNavi->MakeVisible(ETrue);
 if ( !iExtension->iPageNavi )
 {
 iExtension->iPageNavi = new(ELeave) CAknSctPageNavi(this, iExtension);
 iExtension->iPageNavi->SetContainerWindowL(*this);
 TResourceReader reader;
 }
 }
 void CAknCharMap::DisableNavigationButtonsL()
 {
+if ( iExtension && iExtension->iTableNavi )
+{
+iExtension->iTableNavi->MakeVisible( EFalse );
+}
 if ( iExtension && iExtension->iPageNavi )
 {
 iExtension->iPageNavi->MakeVisible( EFalse );
+}
+}
+void CAknCharMap::EnableCategoryButtonsL()
+{
+if (!iExtension->iRadioButton)
+{
+iExtension->iRadioButton = new(ELeave) CAknSctRadioButton(this, iExtension);
+iExtension->iRadioButton->SetContainerWindowL(*this);
+TResourceReader reader;
+iCoeEnv->CreateResourceReaderLC(reader, R_AVKON_SCT_CATEGORY_BUTTON_CONTROL);
+iExtension->iRadioButton->ConstructFromResourceL(reader);
+iExtension->iRadioButton->SetNonFocusing();
+iExtension->iRadioButton->SetMopParent(iExtension);
+CleanupStack::PopAndDestroy(); // reader
+}
+iExtension->iRadioButton->MakeVisible(ETrue);
+}
+void CAknCharMap::DisableCategoryButtonsL()
+{
+if (iExtension && iExtension->iRadioButton)
+{
+iExtension->iRadioButton->MakeVisible(EFalse);
 }
 }
 void CAknCharMap::EnableCategoryInputFieldL()
 {
 CWindowGc& gc=SystemGc();
 gc.UseFont(iFont);
 MAknsSkinInstance* skin = AknsUtils::SkinInstance();
 MAknsControlContext* cc = AknsDrawUtils::ControlContext( this );
-AknLayoutUtils::TAknCbaLocation location = AknLayoutUtils::CbaLocation();
 TRect rect = Rect();
 if (!AknLayoutUtils::PenEnabled() || Extension()->iMenuSct)
 {
 TRect mainPaneRect;
-if(!AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EPopupParent, mainPaneRect))
+if(!AknLayoutUtils::LayoutMetricsRect(
+AknLayoutUtils::EPopupParent, mainPaneRect))
 {
 mainPaneRect = iAvkonAppUi->ClientRect();
 }
-TAknLayoutScalableParameterLimits charMapDialogVariety = AknLayoutScalable_Avkon::popup_grid_graphic_window_ParamLimits();
+TAknLayoutScalableParameterLimits charMapDialogVariety =
+AknLayoutScalable_Avkon::popup_grid_graphic_window_ParamLimits();
 TInt maxVariety = charMapDialogVariety.LastVariety();
+AknLayoutUtils::TAknCbaLocation location = AknLayoutUtils::CbaLocation();
 TInt maxVarietyOffset = 0;
 TInt varietyOffset = maxVariety + 1;
 if(Layout_Meta_Data::IsLandscapeOrientation())
 {
 varietyNumber -= 1;
 }
 varietyNumber += maxVarietyOffset;
 TAknLayoutRect popupGridLayRect;
-popupGridLayRect.LayoutRect(mainPaneRect, AknLayoutScalable_Avkon::popup_grid_graphic_window(varietyNumber));
+popupGridLayRect.LayoutRect(mainPaneRect,
+AknLayoutScalable_Avkon::popup_grid_graphic_window(varietyNumber));
 // Background height.
-TInt backgroundHeightOffset = popupGridLayRect.Rect().Height() - rect.iBr.iY;
+TInt backgroundHeightOffset =
+popupGridLayRect.Rect().Height() - rect.iBr.iY;
 rect.iBr.iY += backgroundHeightOffset;
 }
 else
 {
 TAknLayoutRect popupGridLayRect;
-popupGridLayRect.LayoutRect(iAvkonAppUi->ApplicationRect(), AknLayoutScalable_Avkon::popup_grid_graphic2_window(0));
+popupGridLayRect.LayoutRect(iAvkonAppUi->ApplicationRect(),
+AknLayoutScalable_Avkon::popup_grid_graphic2_window(0));
 // Background height.
-TInt backgroundHeightOffset = popupGridLayRect.Rect().Height() - rect.iBr.iY;
+TInt backgroundHeightOffset =
+popupGridLayRect.Rect().Height() - rect.iBr.iY;
 rect.iBr.iY += backgroundHeightOffset * 2;
 }
 // Grid (main).
 if ( !Extension()->iMenuSct )
 {
 // 1) Draw the background
 // Check if we got an offscreen bitmap allocated for skin background and
 // there is bitmap background in the current skin.
-if( CAknEnv::Static()->TransparencyEnabled() )
+if ( iOffscreenBg )
 {
-TRegionFix<10> clipReg;
+DrawOffscreenBackgroundIfRequired();
-clipReg.AddRect(rect);
+gc.BitBlt( rect.iTl, iOffscreenBg );
+}
-if ( iFirstVisibleRow == 0 && iSetRecentSct )
+else
 {
-TPoint pos = iGridTopLeft;
+if( CAknEnv::Static()->TransparencyEnabled() )
-TSize size(iGridItemWidth*iMaxColumns+1, iGridItemHeight);
+{
-if(iIsMirrored)
+TRegionFix<10> clipReg;
-{
+clipReg.AddRect(rect);
-pos.iX += iGridItemWidth - size.iWidth;
+if ( iFirstVisibleRow == 0 && iSetRecentSct )
-}
+{
-// eliminate the overlap area between menu sct and the first menu item.
+TPoint pos = iGridTopLeft;
-if ( Extension()->iMenuSct )
+TInt endX = pos.iX + iGridItemWidth * iMaxColumns + 1;
-{
+TInt endY = pos.iY + iGridItemHeight;
-size.iHeight--;
+// eliminate the overlap area between menu sct and the first menu item.
-}
+if ( Extension()->iMenuSct )
-clipReg.SubRect(TRect(pos,size));
+{
-}
+endY--;
+}
-// Take scroll bar out of clip region
+clipReg.SubRect( TRect( pos, TPoint( endX, endY ) ) );
-if (iSBFrame)
+}
-{
+// Take scroll bar out of clip region
-clipReg.SubRect(iSBFrame->GetScrollBarHandle(CEikScrollBar::EVertical)->Rect());
+if (iSBFrame)
-}
+{
+clipReg.SubRect(iSBFrame->GetScrollBarHandle(
-gc.SetClippingRegion(clipReg);
+CEikScrollBar::EVertical)->Rect());
 }
+gc.SetClippingRegion(clipReg);
-AknsDrawUtils::Background( skin, cc, this, gc, rect,KAknsDrawParamNoClearUnderImage);
+}
+AknsDrawUtils::Background( skin, cc, this, gc, rect,KAknsDrawParamNoClearUnderImage);
 if( CAknEnv::Static()->TransparencyEnabled() )
 {
 gc.CancelClippingRegion();
 }
+}
-// 2) Draw the grid
 gc.SetPenStyle(CGraphicsContext::ESolidPen);
 gc.SetBrushStyle(CGraphicsContext::ENullBrush);
 gc.SetPenSize(TSize(1,1));
+// 2) Draw the grid
 DrawGrid(gc);
 }
 // Grid (recent).
 if (iFirstVisibleRow==0 && iSetRecentSct)
 if(!EmotionsAreAllReadyToDraw(charIndex, iMaxColumns)) break;
 }
 // grid is focused and cursor pos is same with the current index.
 if ( iExtension->iMenuSct )
-{
+	{
 highlighted = iExtension->iMenuSctHighlighted &&
 (iExtension->iFocusHandler->FocusedControl()==this) &&
 (j==cursorPos);
-}
+	}
 else
-{
+	{
-highlighted = ((iExtension->iFocusHandler->FocusedControl()==this) && (j==cursorPos));
+	highlighted = ((iExtension->iFocusHandler->FocusedControl()==this) && (j==cursorPos));
-}
+	}
 DrawItem(gc, CursorRect(j, charIndex), charIndex, highlighted, EFalse);
 charIndex++;
 }
 iDrawnBefore = ETrue;
 gc.DiscardFont();
 MAknsControlContext* cc = AknsDrawUtils::ControlContext( this );
 if( aHighlighted )
 {
 TRgb color = AKN_LAF_COLOR(210);
 if( !( iExtension->iFlags & EAknCharMapPressedDown )
 || iExtension->iSingleClickEnabled )
 {
 AknsUtils::GetCachedColor( skin,
 color,
 KAknsIIDQsnHighlightColors,
 EAknsCIQsnHighlightColorsCG1 );
 }
 else
 {
 AknsUtils::GetCachedColor( skin, color, KAknsIIDQsnHighlightColors, EAknsCIQsnHighlightColorsCG2 );
 }
 aGc.SetBrushColor(color);
 {
 if ( Layout_Meta_Data::IsLandscapeOrientation() )
 {
 specialCharItemLayout = AknLayoutScalable_Avkon::cell_graphic2_pane_t1(1);
 }
+else if (IsJapaneseSctUi())
+{
+specialCharItemLayout = AknLayoutScalable_Avkon::cell_graphic2_pane_t1(2);
+}
 else
 {
 specialCharItemLayout = AknLayoutScalable_Avkon::cell_graphic2_pane_t1(0);
 }
 }
 }
 TRect textRect = aSctPosition;
 if( IsRecentChar(aCharIndex) )
 {
+textRect.Move(0, -1);       //because height of recent char frame decreased 1.
 if( Extension()->iMenuSct )
 {
 textRect.Move(0, -1);   //because menu sct will also shrink 1.
 }
 }
 {
 AknsUtils::GetCachedColor( skin, color,
 KAknsIIDQsnTextColors, EAknsCIQsnTextColorsCG19 );
 }
-CAknSmileyIcon* icon = iExtension->EmotionIcon(symbol[0]);
+if(TEmotionUtils::IsEmotionChar(symbol[0]))
-if(icon)
+{
-{
+iExtension->DrawEmotion(aGc, textLayout.TextRect(), symbol[0]);
-iExtension->DrawEmotion( aGc, textLayout.TextRect(), icon );
 }
 else
 {
 textLayout.DrawText( aGc, symbol, EFalse, color );
 }
 // Draw the outter thick frame for the all recent chars.
 //-------------------------------------------------------
 //
 void CAknCharMap::DrawRecentCharFrame( CWindowGc& aGc) const
 {
-MAknsSkinInstance* skin = AknsUtils::SkinInstance();
+MAknsSkinInstance*   skin = AknsUtils::SkinInstance();
 MAknsControlContext* cc = iExtension->iBgContext;
 if ( !cc )
 {
 cc = AknsDrawUtils::ControlContext( this );
 }
 TPoint pos = iGridTopLeft;
-TSize size(iGridItemWidth*iMaxColumns+1, iGridItemHeight);
+TInt endX = pos.iX + iGridItemWidth * iMaxColumns + 1;
+TInt endY = pos.iY + iGridItemHeight;
+TRect drawRect(TPoint(pos.iX, pos.iY), TPoint(endX, endY));
 // eliminate the overlap area between menu sct and the first menu item.
 if ( Extension()->iMenuSct )
 {
-// provide a dirty fix for Menu SCT, since Layout data is not suitable for this
+drawRect = Rect();
-size = TSize( Rect().Width()- 1, iGridItemHeight - 1 );
+endY--;
 }
+AknsDrawUtils::Background( skin, cc, this, aGc, drawRect );
+SetRecentCharFrameStyle(aGc);
 if(iIsMirrored)
 {
-pos.iX += iGridItemWidth - size.iWidth;
+pos.iX = iGridTopLeft.iX - ((iMaxColumns - 1) * iGridItemWidth);
-}
+endX = iGridTopLeft.iX + iGridItemWidth + 1;
+}
-AknsDrawUtils::Background(skin, cc, this, aGc, TRect(pos,size));
+aGc.DrawRect( TRect(TPoint(pos.iX-1, pos.iY-1), TPoint(endX, endY)));
-SetRecentCharFrameStyle(aGc);
-aGc.DrawRect(TRect(pos,size));
 MTouchFeedback* feedback = MTouchFeedback::Instance();
 CFeedbackSpec* spec = CFeedbackSpec::New();
 if ( spec && feedback )
 {
 CAknCharMap* mutableThis = MUTABLE_CAST( CAknCharMap* ,this );
 TInt recentChars = mutableThis->LengthOfRecentChar();
 TRect rect;
 spec->AddFeedback( ETouchEventStylusDown,
-ETouchFeedbackList );
+ETouchFeedbackBasicItem );
 rect.SetRect( pos, TPoint( pos.iX + recentChars * iGridItemWidth, pos.iY + iGridItemHeight ));
 if ( iIsMirrored )
 {
 TInt emptyRecentSlots = iMaxColumns - recentChars;
 rect.Move( emptyRecentSlots * iGridItemWidth, 0 );
 MTouchFeedback* feedback = MTouchFeedback::Instance();
 CFeedbackSpec* spec = CFeedbackSpec::New();
 if ( feedback && spec )
 {
-TInt orphans = numberOfCells % iMaxColumns;
+TInt orphans = NumberOfVisibleChars() % iMaxColumns;
-TInt rows = numberOfCells / iMaxColumns;
+TInt rows = NumberOfVisibleChars() / iMaxColumns;
 CAknCharMap* mutableThis = MUTABLE_CAST( CAknCharMap* ,this );
 TInt recentChars = mutableThis->LengthOfRecentChar();
 TRect rectMain;
 TPoint nextTopLeft = iGridTopLeft;
 {
 rectMain.Move( ( 1 - iMaxColumns ) * iGridItemWidth, 0 );
 }
 spec->AddFeedback( ETouchEventStylusDown,
-ETouchFeedbackList );
+ETouchFeedbackBasicItem );
 if ( rows )
 {
 feedback->SetFeedbackArea( this, KAreaIdMain, rectMain, spec );
 }
 else
 ( (iChaMapTableCase!=EAknCharMapTableSpecialChar && !iPictoInterface->Interface()->IsPictograph((*iChars)[0])) ||
 (iChaMapTableCase==EAknCharMapTableSpecialChar && (*iChars)[0]==KHistoryEmptyChar) )
 )
 {
 caseChange = ETrue;
+// Cursor was on the second line
+if (aDeltaY < 0)
+{
+globalYPos--;
+}
 // Cursor was on the second line and first position
 if (aDeltaX < 0 && iCursorPos.iX == 0)
 {
 globalYPos--;
 //iCursorPos.iY = 0;
 else
 {
 pt.iX = index;
 }
 }
+HandleFocusStatusChanged();
 iCursorPos = pt;
 UpdateScrollIndicatorL();
 DrawNow();
 }
 if ((iRows > iExtension->iMaxVisibleRows) &&
 (iOldCursorPos.iY + oldFirstVisibleRow != iCursorPos.iY + iFirstVisibleRow))
 {
 UpdateScrollIndicatorL();
 }
+HandleFocusStatusChanged();
 if (oldFirstVisibleRow == iFirstVisibleRow)
 {
 // Draw only cursor if the view to the content was not scrolled.
 DrawCursor();
 // Calculate the relative rect for the grid
 TRect parent = gridWithScrollLayRect.Rect();
 TAknWindowComponentLayout scrollbarLayout;
-scrollbarLayout = AknLayoutScalable_Avkon::scroll_pane_cp5(0);
+if (iExtension->iHasCategoryButtonUi)
+{
+scrollbarLayout = AknLayoutScalable_Avkon::scroll_pane_cp5(1);
+}
+else
+{
+scrollbarLayout = AknLayoutScalable_Avkon::scroll_pane_cp5(0);
+}
 vSbarModel.iScrollSpan = PageCount() * iExtension->iMaxVisibleRows;
 vSbarModel.iThumbSpan = iExtension->iMaxVisibleRows;
 if (iSBFrame && iSBFrame->TypeOfVScrollBar() == CEikScrollBarFrame::EDoubleSpan)
 return result;
 }
 void CAknCharMap::CreateOffscreenBackgroundL()
 {
+// Offscreen background bitmap for pictograph table - needed for performance.
+// It is created always even if the current skin does not contain bitmap
+// background, because skin change is done in a non-leaving function
+// HandleResourceChange so memory allocations should not be done there.
+MAknsSkinInstance* skin = AknsUtils::SkinInstance();
+MAknsControlContext* cc = AknsDrawUtils::ControlContext( this );
+iOffscreenBgDrawn = EFalse;
+TRect popupGridRect;
+if (!AknLayoutUtils::PenEnabled() || Extension()->iMenuSct)
+{
+TRect mainPaneRect;
+if(!AknLayoutUtils::LayoutMetricsRect(
+AknLayoutUtils::EPopupParent, mainPaneRect))
+{
+mainPaneRect = iAvkonAppUi->ClientRect();
+}
+TAknLayoutScalableParameterLimits charMapDialogVariety =
+AknLayoutScalable_Avkon::popup_grid_graphic_window_ParamLimits();
+TInt maxVariety = charMapDialogVariety.LastVariety();
+AknLayoutUtils::TAknCbaLocation location = AknLayoutUtils::CbaLocation();
+TInt maxVarietyOffset = 0;
+TInt varietyOffset = maxVariety + 1;
+if(Layout_Meta_Data::IsLandscapeOrientation())
+{
+varietyOffset = (maxVariety + 1) / KAknSctCBaButtonDirections;
+}
+if(location == AknLayoutUtils::EAknCbaLocationRight)
+{
+maxVarietyOffset = varietyOffset;
+}
+else if(location == AknLayoutUtils::EAknCbaLocationLeft)
+{
+maxVarietyOffset = varietyOffset + varietyOffset;
+}
+TInt varietyNumber = varietyOffset - iRows;
+if(varietyNumber < 0)
+{
+varietyNumber = 0;
+}
+else if(iRows<=0)
+{
+varietyNumber -= 1;
+}
+varietyNumber += maxVarietyOffset;
+TAknLayoutRect popupGridLayRect;
+popupGridLayRect.LayoutRect(mainPaneRect,
+AknLayoutScalable_Avkon::popup_grid_graphic_window(varietyNumber));
+popupGridRect = popupGridLayRect.Rect();
+}
+else
+{
+TAknLayoutRect popupGridLayRect;
+popupGridLayRect.LayoutRect(iAvkonAppUi->ApplicationRect(),
+AknLayoutScalable_Avkon::popup_grid_graphic2_window(0));
+popupGridRect = popupGridLayRect.Rect();
+}
+if(iOffscreenBg)
+{
+delete iOffscreenBg;
+iOffscreenBg = NULL;
+}
+iOffscreenBg = new( ELeave ) CFbsBitmap;
+TDisplayMode mode = iCoeEnv->ScreenDevice()->DisplayMode();
+// This is larger rect that is actually needed for the charmap
+// control - the problem is that we do not know the changed rect
+// of the charmap control yet (because the dialog is just about
+// to resize itself).
+if(iBitmapDevice)
+{
+delete iBitmapDevice;
+iBitmapDevice = NULL;
+}
+if(iBitmapGc)
+{
+delete iBitmapGc;
+iBitmapGc = NULL;
+}
+User::LeaveIfError(
+iOffscreenBg->Create( popupGridRect.Size(), mode ) );
+iBitmapDevice = CFbsBitmapDevice::NewL( iOffscreenBg );
+User::LeaveIfError( iBitmapDevice->CreateContext( iBitmapGc ) );
 }
 TInt CAknCharMap::NextPageL()
 {
-SetSmileyAnimationActivityInCurrentPageL(EFalse);
+HandleFocusStatusChanged(EFalse);
 TInt page(0);
 iFirstVisibleRow =
 (((iCursorPos.iY + iFirstVisibleRow) / iExtension->iMaxVisibleRows) + 1)
 * iExtension->iMaxVisibleRows;
 }
 }
 UpdateHeadingPane( ETrue );
 UpdateScrollIndicatorL();
-SetSmileyAnimationActivityInCurrentPageL(ETrue);
+HandleFocusStatusChanged();
 DrawNow();
 return page;
 }
 TInt CAknCharMap::PrevPageL()
 {
-SetSmileyAnimationActivityInCurrentPageL(EFalse);
+HandleFocusStatusChanged(EFalse);
 TInt page(0);
 TInt firstVisibleRow =
 (((iCursorPos.iY + iFirstVisibleRow) / iExtension->iMaxVisibleRows) - 1) *
 iExtension->iMaxVisibleRows;
 iCursorPos = TPoint(0, 0);
 }
 }
 UpdateHeadingPane( ETrue );
 UpdateScrollIndicatorL();
-SetSmileyAnimationActivityInCurrentPageL(ETrue);
+HandleFocusStatusChanged();
 DrawNow();
 return page;
 }
 }
 // Draw the background of the item if requested
 else if ( aDrawBackground )
 {
-aGc.SetBrushStyle(CGraphicsContext::ESolidBrush);
+if ( iOffscreenBg )
-aGc.SetBrushColor(AKN_LAF_COLOR(0));
+{
+TRect offscreenRect = aSctPosition;
-TRect innerRect = aSctPosition;
+if (IsRecentChar(aCharIndex))
-if (IsRecentChar(aCharIndex))
+{
-{
+TRgb colorRecentLine = AKN_LAF_COLOR(215);
-innerRect.Shrink(1,1);
+AknsUtils::GetCachedColor( skin, colorRecentLine,
-}
+KAknsIIDQsnLineColors, EAknsCIQsnLineColorsCG7 );
-aGc.Clear( innerRect );
+aGc.SetPenColor(colorRecentLine);
+// draw top line
+aGc.DrawLine( aSctPosition.iTl,
+TPoint( aSctPosition.iBr.iX, aSctPosition.iTl.iY ) );
+// draw under line
+aGc.DrawLine( TPoint( aSctPosition.iTl.iX, aSctPosition.iBr.iY - 1 ),
+TPoint( aSctPosition.iBr.iX, aSctPosition.iBr.iY - 1) );
+if (aCharIndex == 0)
+{
+// draw left line
+aGc.DrawLine( aSctPosition.iTl,
+TPoint( aSctPosition.iTl.iX, aSctPosition.iBr.iY ) );
+}
+if (aCharIndex == (iMaxColumns-1) )
+{
+// draw right line
+aGc.DrawLine( TPoint( aSctPosition.iBr.iX -1, aSctPosition.iTl.iY ),
+TPoint( aSctPosition.iBr.iX -1, aSctPosition.iBr.iY ) );
+}
+}
+TPoint topleft = offscreenRect.iTl;
+// Our offscreen bitmap's origo is in the control rect's top left.
+offscreenRect.Move( -( Rect().iTl ) );
+aGc.BitBlt( topleft, iOffscreenBg, offscreenRect );
+}
+else
+{
+aGc.SetBrushStyle(CGraphicsContext::ESolidBrush);
+aGc.SetBrushColor(AKN_LAF_COLOR(0));
+TRect innerRect = aSctPosition;
+if (IsRecentChar(aCharIndex))
+{
+innerRect.Shrink(1,1);
+}
+aGc.Clear( innerRect );
+}
 }
 if (iPictoInterface->Interface()->IsPictograph((*iChars)[aCharIndex]))
 {
 if (iExtension->iPictographsBufferGrouping)
 {
 }
 }
 void CAknCharMap::DrawOffscreenBackgroundIfRequired() const
 {
+if ( iOffscreenBg )
+{
+if ( !iOffscreenBgDrawn )
+{
+MAknsSkinInstance* skin = AknsUtils::SkinInstance();
+MAknsControlContext* cc = AknsDrawUtils::ControlContext( this );
+TRect popupGridRect;
+if (!AknLayoutUtils::PenEnabled() || Extension()->iMenuSct)
+{
+TRect mainPaneRect;
+if(!AknLayoutUtils::LayoutMetricsRect(
+AknLayoutUtils::EPopupParent, mainPaneRect))
+{
+mainPaneRect = iAvkonAppUi->ClientRect();
+}
+TAknLayoutScalableParameterLimits charMapDialogVariety =
+AknLayoutScalable_Avkon::popup_grid_graphic_window_ParamLimits();
+TInt maxVariety = charMapDialogVariety.LastVariety();
+AknLayoutUtils::TAknCbaLocation location =
+AknLayoutUtils::CbaLocation();
+TInt maxVarietyOffset = 0;
+TInt varietyOffset = maxVariety + 1;
+if(Layout_Meta_Data::IsLandscapeOrientation())
+{
+varietyOffset = (maxVariety + 1)/KAknSctCBaButtonDirections;
+}
+if(location == AknLayoutUtils::EAknCbaLocationRight)
+{
+maxVarietyOffset = varietyOffset;
+}
+else if(location == AknLayoutUtils::EAknCbaLocationLeft)
+{
+maxVarietyOffset = varietyOffset + varietyOffset;
+}
+TInt varietyNumber = varietyOffset - iRows;
+if(varietyNumber < 0)
+{
+varietyNumber = 0;
+}
+else if(iRows<=0)
+{
+varietyNumber -= 1;
+}
+varietyNumber += maxVarietyOffset;
+TAknLayoutRect popupGridLayRect;
+popupGridLayRect.LayoutRect(mainPaneRect,
+AknLayoutScalable_Avkon::popup_grid_graphic_window(varietyNumber));
+popupGridRect = popupGridLayRect.Rect();
+popupGridRect.iTl.iY = Rect().iTl.iY;
+popupGridRect.Move(-popupGridRect.iTl.iX,0);
+TPoint point = TPoint( 0, 0 );
+AknsDrawUtils::DrawBackground(
+skin,
+cc,
+this,
+*iBitmapGc,
+point,
+popupGridRect,
+KAknsDrawParamDefault );
+}
+else
+{
+TAknLayoutRect popupGridLayRect;
+popupGridLayRect.LayoutRect(iAvkonAppUi->ApplicationRect(),
+AknLayoutScalable_Avkon::popup_grid_graphic2_window(
+0));
+popupGridRect = popupGridLayRect.Rect();
+popupGridRect.iTl.iY = Rect().iTl.iY;
+popupGridRect.Move(-popupGridRect.iTl.iX,0);
+TPoint point = TPoint( 0, 0 );
+AknsDrawUtils::DrawBackground(
+skin,
+cc,
+this,
+*iBitmapGc,
+point,
+popupGridRect,
+KAknsDrawParamDefault );
+}
+iOffscreenBgDrawn = ETrue;
+}
+}
 }
 EXPORT_C CCoeControl* CAknCharMap::ComponentControl(TInt aIndex) const
 {
 if (iSBFrame && iSBFrame->TypeOfVScrollBar() == CEikScrollBarFrame::EDoubleSpan)
 return iSBFrame->VerticalScrollBar();
 }
 aIndex--;
 }
+if (iExtension->iRadioButton)
+{
+if ( aIndex == 0 )
+{
+return iExtension->iRadioButton;
+}
+aIndex--;
+}
 if (iExtension->iCategoryTitle)
 {
 if ( aIndex == 0 )
 {
 return iExtension->iCategoryTitle;
 if (iExtension->iCategoryEntry)
 {
 if ( aIndex == 0 )
 {
 return iExtension->iCategoryEntry;
+}
+aIndex--;
+}
+if (iExtension->iTableNavi)
+{
+if ( aIndex == 0 )
+{
+return iExtension->iTableNavi;
 }
 aIndex--;
 }
 if (iExtension->iPageNavi)
 {
 TInt num = 0;
 if (iSBFrame && iSBFrame->TypeOfVScrollBar() == CEikScrollBarFrame::EDoubleSpan)
 {
 num++;
 }
+if (iExtension->iRadioButton)
+{
+num++;
+}
 if (iExtension->iCategoryTitle)
 {
 num++;
 }
 if (iExtension->iCategoryEntry)
+{
+num++;
+}
+if (iExtension->iTableNavi)
 {
 num++;
 }
 if (iExtension->iPageNavi)
 {
 currentcasechars = iExtension->iCharsQwerty;
 iSpecialCharPages.AppendL( PageCountFromChars(*currentcasechars) );
 iSpecialCharCases.AppendL( iSpecialCharCase );
+if (iExtension->iRadioButton)
+{
+// Set the sct case mode to valid
+iExtension->iRadioButton->SetValidSctCase(iSpecialCharCase);
+}
 if (aCase.Count() > 0)
 {
 for (TInt i(0); i < aCase.Count(); ++i)
 {
 HBufC* chars = CharsFromCase(aCase[i]);
 if (chars)
 {
 iSpecialCharCases.AppendL( aCase[i] );
 iSpecialCharPages.AppendL( PageCountFromChars(*chars) );
+if (iExtension->iRadioButton)
+{
+// Set the sct case mode to valid
+iExtension->iRadioButton->SetValidSctCase(aCase[i]);
+}
 }
 }
 }
 if (iExtension->iPictographsBuffer && iPictoInterface)
 iPictographCases.AppendL(EAknCharMapTablePicto);
 if (iExtension->iPictographsBufferGrouping)
 {
 iPictographPages.AppendL( PageCountFromChars(*iPictographsBuffer2) );
 iPictographCases.AppendL(EAknCharMapTablePicto2);
-}
+if (iExtension->iRadioButton)
+{
+// Set the sct case mode to valid
+iExtension->iRadioButton->SetValidSctCase(EAknSCTPictograph1);
+iExtension->iRadioButton->SetValidSctCase(EAknSCTPictograph2);
+}
+}
+else
+{
+if (iExtension->iRadioButton)
+{
+// Set the sct case mode to valid
+iExtension->iRadioButton->SetValidSctCase(EAknSCTPictograph);
+}
+}
+}
+if (iExtension->iRadioButton)
+{
+// Remove invalid category buttons
+iExtension->iRadioButton->RemoveInvalidButton();
+__ASSERT_DEBUG( iExtension->iRadioButton->Count() > 0,
+Panic(EAknPanicInvalidValue));
 }
 }
 void CAknCharMap::SetTitleL(TPtrC aTitle)
 {
 return page;
 }
 void CAknCharMap::CountMaxColumnsAndCellSizes()
 {
-const TBool isLandscape = Layout_Meta_Data::IsLandscapeOrientation();
 TRect mainPaneRect;
 if (!AknLayoutUtils::PenEnabled() || Extension()->iMenuSct)
 {
 if(!AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EMainPane, mainPaneRect))
 {
 TInt maxVariety = charMapDialogVariety.LastVariety();
 AknLayoutUtils::TAknCbaLocation location = AknLayoutUtils::CbaLocation();
 TInt maxVarietyOffset = 0;
 TInt varietyOffset = maxVariety + 1;
-if(isLandscape)
+if(Layout_Meta_Data::IsLandscapeOrientation())
 {
 varietyOffset = (maxVariety + 1) / KAknSctCBaButtonDirections;
 }
 if(location == AknLayoutUtils::EAknCbaLocationRight)
 gridWithScrollLayRect.LayoutRect(popupGridLayRect.Rect(),
 AknLayoutScalable_Avkon::listscroll_popup_graphic_pane());
 TAknLayoutRect gridLayRect;
-gridLayRect.LayoutRect(gridWithScrollLayRect.Rect(),
+if (iExtension->iHasCategoryButtonUi)
-AknLayoutScalable_Avkon::grid_graphic_popup_pane(0));
+{
+gridLayRect.LayoutRect(gridWithScrollLayRect.Rect(),
+AknLayoutScalable_Avkon::grid_graphic_popup_pane(2));
+}
+else
+{
+gridLayRect.LayoutRect(gridWithScrollLayRect.Rect(),
+AknLayoutScalable_Avkon::grid_graphic_popup_pane(0));
+}
 TRect gridRect = Extension()->iMenuSct ? Rect(): gridLayRect.Rect();
 TAknLayoutRect firstCellLayRect;
 firstCellLayRect.LayoutRect(gridRect,
 AknLayoutScalable_Avkon::cell_graphic_popup_pane_cp2(0,0,0));
+TRect firstCellRect;
+if ( Extension()->iMenuSct )
+{
+firstCellRect = TRect( TPoint(0, 0),
+TSize( firstCellLayRect.Rect().Width(), Rect().Height() ) );
+}
+else
+{
+firstCellRect = firstCellLayRect.Rect();
+}
 TAknLayoutRect rightCellLayRect;
 rightCellLayRect.LayoutRect(gridRect,
 AknLayoutScalable_Avkon::cell_graphic_popup_pane_cp2(0,1,0));
-TRect firstCellRect;
+// Max columns.
+iMaxColumns = gridRect.Width() / firstCellRect.Width();
+// Max visible rows.
+iExtension->iMaxVisibleRows = gridRect.Height() / firstCellRect.Height();
 // Cell width.
 iGridItemWidth =
 rightCellLayRect.Rect().iTl.iX - firstCellLayRect.Rect().iTl.iX;
 if (iGridItemWidth < 0)
 {
 iGridItemWidth = -iGridItemWidth;
 }
-if ( Extension()->iMenuSct )
-{
-firstCellRect = TRect( TPoint(0, 0),
-TSize( iGridItemWidth, Rect().Height() ) );
-}
-else
-{
-firstCellRect = firstCellLayRect.Rect();
-}
-TInt firstVisibleIndex = iFirstVisibleRow * iMaxColumns;
-// Max columns.
-iMaxColumns = gridRect.Width() / firstCellRect.Width();
-iFirstVisibleRow = firstVisibleIndex / iMaxColumns;
-// Max visible rows.
-iExtension->iMaxVisibleRows = gridRect.Height() / firstCellRect.Height();
 // Cell height.
 if ( Extension()->iMenuSct )
 {
 iGridItemHeight = firstCellRect.Height();
 }
 }
 else
 {
 TAknLayoutRect popupGridLayRect;
-popupGridLayRect.LayoutRect(iAvkonAppUi->ApplicationRect(), AknLayoutScalable_Avkon::popup_grid_graphic2_window(0));
+popupGridLayRect.LayoutRect(iAvkonAppUi->ApplicationRect(),
+AknLayoutScalable_Avkon::popup_grid_graphic2_window(0));
 TRect popupGridRect = popupGridLayRect.Rect();
-TInt gridVariety = isLandscape ? 7 : 6;
+TInt gridVariety;
+if (!IsJapaneseSctUi())
+{
+if(!Layout_Meta_Data::IsLandscapeOrientation())
+{
+gridVariety = (TableCount() > 1) ? 0 : 1;
+}
+else
+{
+gridVariety = (TableCount() > 1) ? 2 : 3;
+}
+}
+else
+{
+gridVariety = !Layout_Meta_Data::IsLandscapeOrientation() ? 4 : 5;
+}
 TAknLayoutRect gridLayRect;
-gridLayRect.LayoutRect(popupGridRect, AknLayoutScalable_Avkon::grid_graphic2_pane(gridVariety));
+gridLayRect.LayoutRect(popupGridRect,
+AknLayoutScalable_Avkon::grid_graphic2_pane(gridVariety));
 TRect gridRect = gridLayRect.Rect();
-TInt cellVariety = isLandscape ? 1 : 0;
 TAknLayoutRect firstCellLayRect;
-firstCellLayRect.LayoutRect(gridRect, AknLayoutScalable_Avkon::cell_graphic2_pane(cellVariety));
+firstCellLayRect.LayoutRect(popupGridRect,
+AknLayoutScalable_Avkon::aid_size_cell_graphic2(gridVariety,0,0));
 TRect firstCellRect = firstCellLayRect.Rect();
-TInt firstVisibleIndex = iFirstVisibleRow * iMaxColumns;
 // Max columns.
 iMaxColumns = gridRect.Width() / firstCellRect.Width();
-iFirstVisibleRow = firstVisibleIndex / iMaxColumns;
 // Max visible rows.
 iExtension->iMaxVisibleRows = gridRect.Height() / firstCellRect.Height();
-// Cell.
+// Cell width.
 iGridItemWidth = firstCellRect.Width();
+// Cell height.
 iGridItemHeight = firstCellRect.Height();
 }
 }
 HBufC* CAknCharMap::CharsFromCase(TInt aCharCase) const
 // to the array in which all the special characters are placed by the normal
 // (rocker) method.
 //--------------------------------------------------------------------------
 EXPORT_C void CAknCharMap::HandlePointerEventL(const TPointerEvent& aPointerEvent)
 {
-iExtension->iKeyBrdEvent = EFalse;
 if ( AknLayoutUtils::PenEnabled() && Rect().Contains(aPointerEvent.iPosition))
 {
 if (iExtension->iFocusHandler->FocusedControl() != this)// Tapping will move focus to grid.
 {
 iExtension->iFocusHandler->LeaveControl();
 // down event on an item, play feedback
 MTouchFeedback* feedback = MTouchFeedback::Instance();
 if ( feedback &&
 aPointerEvent.iType == TPointerEvent::EButton1Down )
 {
-feedback->InstantFeedback( this, ETouchFeedbackList );
+feedback->InstantFeedback( this, ETouchFeedbackBasicItem );
 }
 if ( aPointerEvent.iType == TPointerEvent::EDrag &&
 iCursorPos != iOldCursorPos )
 {
 // Disable selection.
 {
 if( iExtension->iSingleClickEnabled )
 {
 iExtension->iHighlightVisible = ETrue;
 }
+HandleFocusStatusChanged();
 }
 DrawCursor();
 }
 else if (aPointerEvent.iType == TPointerEvent::EButton1Up)
 // play feedback
 MTouchFeedback* feedback = MTouchFeedback::Instance();
 if ( feedback )
 {
 feedback->InstantFeedback( this,
-ETouchFeedbackList,
+ETouchFeedbackBasicItem,
 ETouchFeedbackVibra,
 TPointerEvent() );
 }
 iExtension->iObserver->HandleControlEventL(
 else if ( iExtension->iSingleClickEnabled )
 {
 iExtension->iHighlightVisible = EFalse;
 DrawCursor();
 }
+CCoeControl::HandlePointerEventL(aPointerEvent);
 // if Stylus is lifted we clear all flags.
 if (aPointerEvent.iType == TPointerEvent::EButton1Up)
 {
 iExtension->iFlags &= (~EAknCharMapButton1DownInGrid);
 iExtension->iFlags &= (~EAknCharMapHasBeenScrolledByDrag);
 iExtension->iFlags &= (~EAknCharMapPressedDown);
-if ( iSBFrame )
+if ( !iSBFrame )
 {
-CEikScrollBar* vScrollBar = iSBFrame->VerticalScrollBar();
+return;
-if(vScrollBar)
+}
-{
+CEikScrollBar* vScrollBar = iSBFrame->VerticalScrollBar();
-vScrollBar->HandlePointerEventL(aPointerEvent);
+if(vScrollBar)
-}
+{
-}
+vScrollBar->HandlePointerEventL(aPointerEvent);
 }
 }
-else
+}
-{
-if(iExtension->iSingleClickEnabled)
-{
-iExtension->iHighlightVisible = EFalse;
-DrawCursor();
-}
-}
-CCoeControl::HandlePointerEventL(aPointerEvent);
 }
 // -----------------------------------------------------------------------------
 // CAknCharMap::SetObserver
 // Sets the observer.
 {
 if (iExtension->iObserver)
 {
 iExtension->iObserver->HandleControlEventL(this, MCoeControlObserver::EEventRequestFocus);
 }
+HandleFocusStatusChanged();
 DrawDeferred();
 }
 }
 // -----------------------------------------------------------------------------
 }
 TPtrC textHistory = iCharMapHistory->RecentString(historyType, CAknCharMapHistory::EHistoryFilterTextOnly);
 *charsBuf = InsertSwitchCharAndHistoryToCharsBufL(*charsBuf,
-iExtension->SwitchToEmotionChar(),
+TEmotionUtils::EmotionSwitchToSmileyChar(),
 textHistory);
 }
 // Emotion history
 TPtrC emotionHistory = iCharMapHistory->RecentString(CAknCharMapHistory::EHistoryTypeFull, CAknCharMapHistory::EHistoryFilterEmotionOnly);
 iExtension->iCharsSmiley = InsertSwitchCharAndHistoryToCharsBufL(iExtension->iCharsSmiley,
-iExtension->SwitchToSctChar(),
+TEmotionUtils::EmotionSwitchToSctChar(),
 emotionHistory);
 // ETrue are set to each variable when setting the recent used characters.
 iSetRecentSct = ETrue;
 iSetRecentPic = ETrue;
 // Check whether recent charcters are included in base charcters.
 TBuf<CAknCharMapHistory::KHistoryBufferSize+5> insertBuffer;
 for (TInt index=0; index<aHistory.Length(); index++)
 {
 TChar txt = aHistory[index];
-if(aCharsBuf->Locate(txt)!=KErrNotFound || Extension()->IsEmotionChar(txt) || txt==KHistoryEmptyChar)
+if(aCharsBuf->Locate(txt)!=KErrNotFound || TEmotionUtils::IsEmotionChar(txt) || txt==KHistoryEmptyChar)
 {
 insertBuffer.Append(txt);
 }
 }
 break;
 }
 if (historyType > CAknCharMapHistory::EHistoryTypeNull)
 {
-TBool isEmotion = Extension()->IsEmotionChar(aChar);
+iCharMapHistory->InsertChar(historyType, aChar);
-iCharMapHistory->InsertChar(historyType, aChar, isEmotion);
 }
 // Save recent data
 iCharMapHistory->SaveL();
 }
 TInt resourceId = R_AVKON_MENU_SCT_ROW_DEFAULT_CONTENTS;
 if (FeatureManager::FeatureSupported(KFeatureIdChinese))
 {
 resourceId = R_AVKON_MENU_SCT_ROW_DEFAULT_CONTENTS_CHINESE;
-}
-else if (FeatureManager::FeatureSupported(KFeatureIdKorean))
-{
-// Added korea character support
-resourceId = R_AVKON_MENU_SCT_ROW_DEFAULT_CONTENTS_KOREAN;
 }
 CCoeEnv::Static()->CreateResourceReaderLC( reader, resourceId );
 ConstructFromResourceL( reader );
 CleanupStack::PopAndDestroy();
 // If the row is empty, nothing to do
 if (LengthOfRecentChar() == 0)
 {
 return;
 }
-// The "PlayAnimationL" in "SetSmileyAnimationActivityInCurrentPageL"
-// will leave. If we ignore it, just no animation is played.
+HandleFocusStatusChanged(aHighlight);
-TRAP_IGNORE( SetSmileyAnimationActivityInCurrentPageL(aHighlight) );
 CWindowGc& gc = SystemGc();
 if( !CAknEnv::Static()->TransparencyEnabled() )
 {
 ActivateGc();
 gc.DiscardFont();
 DeactivateGc();
 }
 // Menu SCT is being used.
 if ( Extension()->iMenuSct )
-{
+	{
-Extension()->iMenuSctHighlighted = aHighlight;
+	Extension()->iMenuSctHighlighted = aHighlight;
-}
+	}
 }
 // -----------------------------------------------------------------------------
 // CAknCharMap::SetMenuSctRect()
 // Sets the rect for menu SCT.
 // -----------------------------------------------------------------------------
 default:
 break;
 }
 CAknCharMapHistory::THistoryFilter historyFilter;
-if(Extension()->IsEmotionEnabled())
+if(iExtension->IsEmotionEnabled())
 {
 historyFilter = CAknCharMapHistory::EHistoryFilterMixed;
 }
 else
 {
 }
 else
 {
 iShowCasesRef = &iSpecialCharCases;
 iShowPagesRef = &iSpecialCharPages;
+iChars = iCharsBufferLower;
 if (iCharsBufferUpper && iSpecialCharCase==EAknSCTUpperCase)
-{
 iChars = iCharsBufferUpper;
-}
 else if (iCharsBufferNumeric && iSpecialCharCase==EAknSCTNumeric)
-{
 iChars = iCharsBufferNumeric;
-}
 else if (iCharsBufferFull && iSpecialCharCase==EAknSCTFullCase)
-{
 iChars = iCharsBufferFull;
-}
 else if (iCharsBufferHalf && iSpecialCharCase==EAknSCTHalfCase)
-{
 iChars = iCharsBufferHalf;
-}
 else if (iExtension->iCharsQwerty && iSpecialCharCase==EAknSCTQwerty)
-{
 iChars = iExtension->iCharsQwerty;
-}
-else
+if(iChars == iCharsBufferLower)
 {
-// default
 iSpecialCharCase = EAknSCTLowerCase;
-iChars = iCharsBufferLower;
 }
 }
 // mark that iChars doesn't point to HBufC
 iExtension->iFlags &= (~EAknCharMapCharsAllocated);
 }
 ptrrecent.Copy(recentChars);
 for (TInt index=0; index < ptrrecent.Length(); index++)
 {
 if (ptrrecent[index] != KHistoryEmptyChar)
 {
-if(Extension()->IsEmotionChar(ptrrecent[index]))
+if(TEmotionUtils::IsEmotionChar(ptrrecent[index]))
 {
 continue;
 }
 else
 {
 if (err == KErrNotFound)
 {
 ptrrecent.Delete(index,1);
 ptrrecent.Append(KHistoryEmptyChar);
 index--;
 }
 }
 }
 }
 if (iExtension->iFlags & EAknCharMapCharsAllocated) // iChars already contains HBufC
 {                                               // so delete old instance
 iCursorPos = TPoint(0, 0);
 }
 iExtension->iFlags |= EAknCharMapCharsAllocated; // mark that iChars points to HBufC
 }
-Extension()->LoadEmotionTumbnails(*iChars);
+iExtension->LoadEmotionTumbnails(*iChars);
-// control will never get focus event while it is in EditMenu mode
+HandleFocusStatusChanged();
-Extension()->iCharMapFocusGained = ETrue;
-// The "PlayAnimationL" in "SetSmileyAnimationActivityInCurrentPageL"
-// will leave. If we ignore it, just no animation is played.
-TRAP_IGNORE( SetSmileyAnimationActivityInCurrentPageL(ETrue) );
 }
 // -----------------------------------------------------------------------------
 // CAknCharMap::CharacterCase()
 // Get current character case.
 headingPane->SetPageL( CurrentPage(), PageCount() );
 // Update also title if requested
 if ( aUpdateTitle)
 {
-const TDesC* title = Title();
+const TDesC* title = (IsJapaneseSctUi())?
+TitleWithSelectingSpecialChar()
+:Title();
 if ( title )
 {
 //
 headingPane->SetTextL( *title );
 }
 }
 TBool CAknCharMap::IsSupportCategoryButtonUi() const
 {
-return EFalse;
+return (iExtension)? iExtension->iHasCategoryButtonUi : EFalse;
 }
 TBool CAknCharMap::IsJapaneseSctUi() const
 {
-//Japanese feature for SCT will not be supported since TB9.2 PS2,
+return (iExtension)? iExtension->iJapaneseSctUi : EFalse;
-//so it always return EFalse.
+}
-return EFalse;
-}
-TBool CAknCharMap::IsKoreanSctUi() const
-{
-return FeatureManager::FeatureSupported( KFeatureIdKorean );
-}
 // -----------------------------------------------------------------------------
 // CAknCharMap::TitleWithSelectingSpecialChar()
 // Return the title string with the selecting special characters
 // -----------------------------------------------------------------------------
 //
 TRAP_IGNORE(MoveCursorL(aX,aY));
 }
 TBool CAknCharMap::LeaveControl()
 {
+HandleFocusStatusChanged(EFalse);
 CWindowGc& gc = SystemGc();
 if( !CAknEnv::Static()->TransparencyEnabled() )
 {
 ActivateGc();
 gc.UseFont(iFont);
 }
 // for emotion added
+void CAknCharMap::HandleFocusStatusChanged(TBool aIsFocused)
+{
+TInt focusPos = iCursorPos.iX + (iFirstVisibleRow + iCursorPos.iY) * iMaxColumns;
+if(focusPos>=0 && focusPos<iChars->Length())
+{
+aIsFocused &= (iExtension->iFocusHandler->FocusedControl()==this);
+iExtension->HandleFocusStatusChanged((*iChars)[focusPos], aIsFocused);
+}
+}
 TBool CAknCharMap::EmotionsAreAllReadyToDraw(TInt aIndex, TInt aCount) const
 {
 for(TInt i(0); i<aCount; i++)
 {
 if(aIndex < iChars->Length())
 {
-TChar code = (*iChars)[aIndex++];
+TChar name = (*iChars)[aIndex++];
-CAknSmileyIcon* icon = Extension()->EmotionIcon(code);
+CSmileyIcon* icon = iExtension->EmotionIcon(name);
 if(icon && !icon->ReadyToDraw())
 {
 return EFalse;
 }
 }
 }
 return ETrue;
 }
-void CAknCharMap::SmileyStillImageLoaded(TChar aChar)
+void CAknCharMap::GetFocusSctName(TChar& aChar, TDes& aName) const
 {
-const CAknSmileyIcon* loadedIcon = Extension()->EmotionIcon(aChar);
+TInt pos = iMaxColumns * (iFirstVisibleRow + iCursorPos.iY) + iCursorPos.iX;
-for(TInt i(0); i<iChars->Length(); i++)
+aChar = (*iChars)[pos];
-{
-TChar code = (*iChars)[i];
-CAknSmileyIcon* icon = Extension()->EmotionIcon(code);
-if(icon == loadedIcon)
-{
-if((i%iMaxColumns == 0) || (i == iChars->Length()-1))
-{
-DrawDeferred(); // a new line is finished
-}
-}
-}
-}
-void CAknCharMap::SmileyAnimationChanged(TChar aChar)
-{
-const CAknSmileyIcon* loadedIcon = Extension()->EmotionIcon(aChar);
-TInt pageVolume = iExtension->iMaxVisibleRows * iMaxColumns;
-for(TInt i(0); i<iChars->Length(); i++)
+aName.Zero();
-{
-TChar code = (*iChars)[i];
-CAknSmileyIcon* icon = iExtension->EmotionIcon(code);
-if(icon == loadedIcon)
-{
-TInt index = i % pageVolume;
-TPoint pos(index%iMaxColumns, index/iMaxColumns);
-// grid is focused and cursor pos is same with the current index.
-TBool highlighted = EFalse;
-if(iExtension->iFocusHandler->FocusedControl()==this && iCursorPos==pos)
-{
-highlighted = (!iExtension->iMenuSct || iExtension->iMenuSctHighlighted);
-}
-DrawCell(index, highlighted);
-}
-}
-}
-void CAknCharMap::SetSmileyAnimationActivityInCurrentPageL(TBool aIsActive)
-{
-TInt pos = iFirstVisibleRow * iMaxColumns;
-TInt maxLength = iChars->Length() - pos;
-TInt length = iExtension->iMaxVisibleRows * iMaxColumns;
-if(length > maxLength) length = maxLength;
-const TPtrC textInCurrentPage = iChars->Mid(pos, length);
-if(Extension()->iCharMapFocusGained && aIsActive)
+if(TEmotionUtils::IsEmotionChar(aChar))
 {
-Extension()->PlayAnimationL(textInCurrentPage);
+CSmileyIcon* icon = iExtension->EmotionIcon(aChar);
-}
+if ( icon )
-else
+{
-{
+aName.Append(icon->Name());
-Extension()->StopAnimation(textInCurrentPage);
+}
-}
-}
-void CAknCharMap::GetFocusSctName(TChar& aChar, TDes& aName) const
-{
-TInt pos = iMaxColumns * (iFirstVisibleRow + iCursorPos.iY) + iCursorPos.iX;
-aChar = (*iChars)[pos];
-aName.Zero();
-if(Extension()->IsEmotionChar(aChar))
-{
-aName.Append(Extension()->EmotionText(aChar));
 }
 else
 {
 aName.Append(aChar);
 }
 TChar sctChar;
 TBuf<10> sctName;
 GetFocusSctName(sctChar, sctName);
 if(Extension()->NeedEmotionSwitchIcon() &&
-(sctChar==Extension()->SwitchToSctChar() || sctChar==Extension()->SwitchToEmotionChar()))
+(sctChar==TEmotionUtils::EmotionSwitchToSctChar() || sctChar==TEmotionUtils::EmotionSwitchToSmileyChar()))
 {
 SwitchSctAndEmotionL();
 }
 else if(iFetcherCharsBuffer->Length() + sctName.Length() < iFetcherCharsBuffer->MaxLength())
 {
 TBool CAknCharMap::SwitchSctAndEmotionL()
 {
 if(Extension()->IsEmotionEnabled())
 {
-Extension()->SwitchEmotionVisibilityL();
+Extension()->iIsShowingEmotion = !Extension()->IsShowingEmotion();
-SetSmileyAnimationActivityInCurrentPageL(EFalse);
 SetCharacterCaseL(iSpecialCharCase);
-SetSmileyAnimationActivityInCurrentPageL(ETrue);
+CAknSctTableNavi* tableNavi = Extension()->iTableNavi;
+if(tableNavi)
-CAknSctPageNavi* pageNavi = Extension()->iPageNavi;
+{
-if(pageNavi)
+tableNavi->UpdateNextTableButtonL();
-{
-pageNavi->UpdateNextTableButtonL();
 }
 DrawNow();
 return ETrue;

branch	RCL_3
changeset 19	aecbbf00d063
parent 18	fcdfafb36fe7
child 20	d48ab3b357f1