--- a/uifw/AvKon/src/aknlistquerydialog.cpp Tue May 11 16:27:42 2010 +0300
+++ b/uifw/AvKon/src/aknlistquerydialog.cpp Tue May 25 12:58:19 2010 +0300
@@ -262,17 +262,9 @@
listbox->SetListBoxObserver(this);
CAknListQueryControl* listControl = ListControl();
- if ( listControl )
- {
- listControl->SetLayout( &iLayout );
- }
-
- if ( iAvkonAppUi->IsSingleClickCompatible() &&
- !IsLeftSoftkeyShown() )
- {
- MakeLeftSoftkeyVisible( EFalse );
- }
- }
+ if (listControl)
+ listControl->SetLayout(&iLayout);
+ }
if (FindBox())
{
@@ -469,16 +461,6 @@
iIdle->Start(TCallBack(ClosePopupAcceptingChanges, this));
}
}
-
- if( iAvkonAppUi->IsSingleClickCompatible() &&
- aListBox->IsMultiselection() )
- {
- CEikListBox* listbox = ListBox();
- if( listbox )
- {
- MakeLeftSoftkeyVisible( IsLeftSoftkeyShown() );
- }
- }
}
break;
default:
@@ -583,22 +565,16 @@
}
TInt currentSelection = listbox->CurrentItemIndex();
- TBool isSingleClick = iAvkonAppUi->IsSingleClickCompatible();
- if ( currentSelection == KErrNotFound )
+ if( currentSelection == KErrNotFound )
{
- MakeLeftSoftkeyVisible( EFalse );
+ MakeLeftSoftkeyVisible(EFalse);
}
- else if ( isSingleClick )
+ else
{
- MakeLeftSoftkeyVisible( IsLeftSoftkeyShown() );
+ MakeLeftSoftkeyVisible(ETrue);
}
TKeyResponse response = listbox->OfferKeyEventL( aKeyEvent, aType);
-
- if ( isSingleClick && IsLeftSoftkeyShown() )
- {
- MakeLeftSoftkeyVisible( ETrue );
- }
if (currentSelection != listbox->CurrentItemIndex() && iMediatorObs)
{
iMediatorObs->UpdateL(listbox->CurrentItemIndex());
@@ -766,8 +742,12 @@
}
-EXPORT_C void* CAknListQueryDialog::ExtensionInterface( TUid /*aInterface*/ )
- {
+EXPORT_C void* CAknListQueryDialog::ExtensionInterface( TUid aInterface )
+ {
+ if(aInterface == KExIfTactileFeedbackUid)
+ {
+ return MTouchFeedback::Instance();
+ }
return NULL;
}
@@ -794,18 +774,6 @@
return NULL;
}
-TBool CAknListQueryDialog::IsLeftSoftkeyShown()
- {
- CEikListBox* listbox = ListBox();
- __ASSERT_DEBUG( listbox, Panic(EAknPanicNullPointer));
- // This flag indicators that listbox is a viewer listbox.
- TBool isViewMode = listbox->View()->ItemDrawer()->Flags() &
- CListItemDrawer::EDisableHighlight;
-
- return listbox->IsHighlightEnabled() ||
- listbox->SelectionIndexes()->Count() > 0 || isViewMode;
- }
-
EXPORT_C void CAknListQueryDialog::SetTone(TInt aTone)
{
iTone = (TTone)aTone;