equal
deleted
inserted
replaced
533 // We're starting again from scratch, so delete the old layout(s) |
533 // We're starting again from scratch, so delete the old layout(s) |
534 iLegendArray.ResetAndDestroy(); |
534 iLegendArray.ResetAndDestroy(); |
535 |
535 |
536 if( iSettingType == ECamSettingItemVideoQuality ) |
536 if( iSettingType == ECamSettingItemVideoQuality ) |
537 { |
537 { |
538 if ( AknLayoutUtils::PenEnabled() ) |
538 if ( CamUtility::IsNhdDevice() ) |
539 { |
539 { |
540 TouchLayoutVideo(); |
540 TouchLayoutVideo(); |
541 } |
541 } |
542 else |
542 else |
543 { |
543 { |
547 AppendLegendArrayL( ECamPsiVideoQualityIconIds ); |
547 AppendLegendArrayL( ECamPsiVideoQualityIconIds ); |
548 AppendLegendArrayL( ECamPsiVideoQualityFileTypeId, iNumSliderValues ); |
548 AppendLegendArrayL( ECamPsiVideoQualityFileTypeId, iNumSliderValues ); |
549 } |
549 } |
550 else // iSettingType == ECamSettingItemPhotoQuality |
550 else // iSettingType == ECamSettingItemPhotoQuality |
551 { |
551 { |
552 if ( AknLayoutUtils::PenEnabled() ) |
552 if ( CamUtility::IsNhdDevice() ) |
553 { |
553 { |
554 TouchLayoutPhoto(); |
554 TouchLayoutPhoto(); |
555 } |
555 } |
556 else |
556 else |
557 { |
557 { |
651 for( TInt i = 0; i < array.Count(); i+=2 ) |
651 for( TInt i = 0; i < array.Count(); i+=2 ) |
652 { |
652 { |
653 // get positioning info |
653 // get positioning info |
654 if ( iSettingType == ECamSettingItemVideoQuality ) |
654 if ( iSettingType == ECamSettingItemVideoQuality ) |
655 { |
655 { |
656 if ( AknLayoutUtils::PenEnabled() ) |
656 if ( CamUtility::IsNhdDevice() ) |
657 { |
657 { |
658 layout = GetTouchVideoLegendLayout( Rect(), |
658 layout = GetTouchVideoLegendLayout( Rect(), |
659 i/2 + aNumSliderValues ); |
659 i/2 + aNumSliderValues ); |
660 } |
660 } |
661 else |
661 else |
664 i/2 + aNumSliderValues ); |
664 i/2 + aNumSliderValues ); |
665 } |
665 } |
666 } |
666 } |
667 else |
667 else |
668 { |
668 { |
669 if ( AknLayoutUtils::PenEnabled() ) |
669 if ( CamUtility::IsNhdDevice() ) |
670 { |
670 { |
671 if ( IsThreeTicksSlider() ) |
671 if ( IsThreeTicksSlider() ) |
672 { |
672 { |
673 // Touch layouts supports only three ticks sliders |
673 // Touch layouts supports only three ticks sliders |
674 layout = GetTouchPhotoLegendLayout( Rect(), |
674 layout = GetTouchPhotoLegendLayout( Rect(), |