--- a/textinput/peninputarc/src/peninputlayoutcontrol/peninputlayoutbutton.cpp Thu Aug 19 10:15:25 2010 +0300
+++ b/textinput/peninputarc/src/peninputlayoutcontrol/peninputlayoutbutton.cpp Tue Aug 31 15:31:50 2010 +0300
@@ -15,7 +15,6 @@
*
*/
-#include <featmgr.h>
#include <AknFepGlobalEnums.h>
#include "peninputlayoutbutton.h"
#include "peninputlayouttimer.h"
@@ -48,23 +47,7 @@
CleanupStack::Pop(btn);
return btn;
}
-
-// ---------------------------------------------------------------------------
-// CButtonBase::BaseConstructL
-// Do base contruction
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CButtonBase::BaseConstructL()
- {
- CFepUiBaseCtrl::BaseConstructL();
- //tap accuracy enhancement
- if( FeatureManager::FeatureSupported( KFeatureIdFfCapacitiveDisplay ))
- {
- EnableExtResponseArea( ETrue, TRect(TPoint(10,10),TSize(10,10)) );
- }
- }
-
// ---------------------------------------------------------------------------
// CButtonBase::CButtonBase
// C++ default constructor
@@ -90,7 +73,6 @@
SetBkColor(KDefaultButtonBackCol);
- //todo code refactoring needed, move to BaseConstructL
#ifdef RD_TACTILE_FEEDBACK
//Advanced Tactile feedback REQ417-47932
if(aUiLayout)
@@ -103,8 +85,8 @@
}
else
{
- SetTactileFeedbackType(ETouchFeedbackSensitiveInput);
- aUiLayout->RegisterFeedbackArea(reinterpret_cast<TInt>(this),aRect,ETouchFeedbackSensitiveInput);
+ SetTactileFeedbackType(ETouchFeedbackSensitiveKeypad);
+ aUiLayout->RegisterFeedbackArea(reinterpret_cast<TInt>(this),aRect,ETouchFeedbackSensitiveKeypad);
}
}
#endif //RD_TACTILE_FEEDBACK
@@ -358,8 +340,6 @@
//
EXPORT_C void CButtonBase::SetDimmed(TBool aDimFlag)
{
- if(iDimmed == aDimFlag)
- return;
//Remove its active flag if dim an active button.
if(aDimFlag && IsActive())
SetActive(EFalse);