equal
deleted
inserted
replaced
114 } |
114 } |
115 else |
115 else |
116 { |
116 { |
117 AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, rect ); |
117 AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, rect ); |
118 } |
118 } |
119 if ( CamUtility::IsNhdDevice() ) |
119 if ( AknLayoutUtils::PenEnabled() ) |
120 { |
120 { |
121 TInt variant = Layout_Meta_Data::IsLandscapeOrientation(); |
121 TInt variant = Layout_Meta_Data::IsLandscapeOrientation(); |
122 vidProgressPane.LayoutRect( rect, |
122 vidProgressPane.LayoutRect( rect, |
123 AknLayoutScalable_Apps::vid4_progress_pane( variant ) ); |
123 AknLayoutScalable_Apps::vid4_progress_pane( variant ) ); |
124 layoutRect.LayoutRect( vidProgressPane.Rect(), |
124 layoutRect.LayoutRect( vidProgressPane.Rect(), |
529 // not be drawn. |
529 // not be drawn. |
530 if( appUi |
530 if( appUi |
531 && appUi->CurrentViewState() == ECamViewStatePreCapture |
531 && appUi->CurrentViewState() == ECamViewStatePreCapture |
532 && appUi->DrawPreCaptureCourtesyUI() |
532 && appUi->DrawPreCaptureCourtesyUI() |
533 && !appUi->IsSecondCameraEnabled() |
533 && !appUi->IsSecondCameraEnabled() |
534 && ( CamUtility::IsNhdDevice() || videoOperation == ECamNoOperation ) |
534 && ( AknLayoutUtils::PenEnabled() || videoOperation == ECamNoOperation ) |
535 ) |
535 ) |
536 { |
536 { |
537 iFileTypeIndicator->Draw( aGc ); |
537 iFileTypeIndicator->Draw( aGc ); |
538 } |
538 } |
539 } |
539 } |
579 } |
579 } |
580 else |
580 else |
581 { |
581 { |
582 AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, rect ); |
582 AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, rect ); |
583 } |
583 } |
584 if ( CamUtility::IsNhdDevice() ) |
584 if ( AknLayoutUtils::PenEnabled() ) |
585 { |
585 { |
586 TInt variant = Layout_Meta_Data::IsLandscapeOrientation(); |
586 TInt variant = Layout_Meta_Data::IsLandscapeOrientation(); |
587 vidProgressPane.LayoutRect( rect, |
587 vidProgressPane.LayoutRect( rect, |
588 AknLayoutScalable_Apps::vid4_progress_pane( variant ) ); |
588 AknLayoutScalable_Apps::vid4_progress_pane( variant ) ); |
589 layoutRect.LayoutRect( vidProgressPane.Rect(), |
589 layoutRect.LayoutRect( vidProgressPane.Rect(), |