--- a/textinput/peninputarc/src/peninputlayoutcontrol/peninputlayoutchoicelist.cpp	Thu Aug 19 10:15:25 2010 +0300
+++ b/textinput/peninputarc/src/peninputlayoutcontrol/peninputlayoutchoicelist.cpp	Tue Aug 31 15:31:50 2010 +0300
@@ -238,7 +238,6 @@
     SetControlType(ECtrlPopupChoiceList);
 	iSubItemSkinID 		= KAknsIIDNone;
 	iBackgroundSkinID   = KAknsIIDNone;
-	iAlign              = CGraphicsContext::ELeft;
     }
 
 // CFepLayoutChoiceList::HitTest
@@ -295,7 +294,7 @@
 		#ifdef RD_TACTILE_FEEDBACK
         if (UiLayout()->SupportTactileFeedback())
         	{
-        	UiLayout()->DoTactileFeedback(ETouchFeedbackSensitiveInput, ETrue, EFalse);
+        	UiLayout()->DoTactileFeedback(ETouchFeedbackSensitiveKeypad, ETrue, EFalse);
         	}
 		#endif //RD_TACTILE_FEEDBACK     
         }
@@ -308,6 +307,12 @@
             iCurFocusItem = index;
        		Draw();
             UpdateArea(Rect(),EFalse);
+			#ifdef RD_TACTILE_FEEDBACK
+            if (UiLayout()->SupportTactileFeedback())
+            	{
+            	UiLayout()->DoTactileFeedback(ETouchFeedbackSensitiveKeypad);
+            	}
+			#endif //RD_TACTILE_FEEDBACK
             }
         }
     return this;
@@ -348,7 +353,7 @@
             {
             if ( iLastSelIndex != iCurFocusItem) 
                 {
-                UiLayout()->DoTactileFeedback(ETouchFeedbackSensitiveInput);
+                UiLayout()->DoTactileFeedback(ETouchFeedbackSensitiveKeypad);
                 iLastSelIndex = iCurFocusItem;
                 }
             }
@@ -386,7 +391,7 @@
 		#ifdef RD_TACTILE_FEEDBACK
 		if (UiLayout()->SupportTactileFeedback())
 			{
-			UiLayout()->DoTactileFeedback(ETouchFeedbackSensitiveInput, ETrue, EFalse);
+			UiLayout()->DoTactileFeedback(ETouchFeedbackSensitiveKeypad, ETrue, EFalse);
 			}
 		#endif //RD_TACTILE_FEEDBACK	
         }
@@ -446,7 +451,7 @@
        	    iSubItemSkinID.iMinor != EAknsMinorNone)
        		{
        		gc->Activate( BitmapDevice() ); 
-			AknsDrawUtils::DrawFrame( UiLayout()->SkinInstance(), 
+			AknsDrawUtils::DrawFrame( AknsUtils::SkinInstance(), 
                          *gc, 
                          rtFocusRect, 
                          rtInnerRect,
@@ -482,7 +487,7 @@
         gc->SetPenColor(iFontColor);
         gc->SetPenStyle(CGraphicsContext::ESolidPen);
 
-        gc->DrawText(aItem.iText, aRect, iBaseline, iAlign, iMargin);
+        gc->DrawText(aItem.iText, aRect, iBaseline, CGraphicsContext::ELeft, iMargin);
 
         gc->DiscardFont();
         }
@@ -505,7 +510,7 @@
 	    CFbsBitGc* gc = static_cast<CFbsBitGc*>(BitGc());
 	    
 	    gc->Activate( BitmapDevice() ); 
-		AknsDrawUtils::DrawFrame( UiLayout()->SkinInstance(), 
+		AknsDrawUtils::DrawFrame( AknsUtils::SkinInstance(), 
 	                     *gc, 
 	                     aRect, 
 	                     rtInnerRect,
@@ -580,7 +585,6 @@
 //
 EXPORT_C void CFepLayoutChoiceList::OnDisplay()
     {
-    iCurFocusItem = -1; 
     ReCalcLayout();
     }
 
@@ -653,9 +657,4 @@
     {
     TRAP_IGNORE(AfterDisplayedL());
     }
-
-EXPORT_C void CFepLayoutChoiceList::SetTextAlignment(const CGraphicsContext::TTextAlign aAlign)
-	{
-	iAlign = aAlign;
-	}
 //End Of File