diff -r ba33815114d6 -r abcbdabaa4c5 layouts/aknlayout2/cdl/AknLayoutScalable_Avkon.cdl
--- a/layouts/aknlayout2/cdl/AknLayoutScalable_Avkon.cdl	Thu Jan 07 13:25:09 2010 +0200
+++ b/layouts/aknlayout2/cdl/AknLayoutScalable_Avkon.cdl	Mon Jan 18 21:12:52 2010 +0200
@@ -2,7 +2,7 @@
 // This file was generated by:
 // aknlayoutcompiler MLCompData2CDL -nodeletes -allparams ..\xml\av\_all\php_av_qhd_prt_tch\display_eur_compData.xml ..\xml\av\_all\phl_av_qhd_lsc_tch\display_eur_compData.xml ..\cdl\AknLayoutScalable_Avkon.cdl 0x1020384E
 // Generated from ..\xml\av\_all\php_av_qhd_prt_tch\display_eur_compData.xml, ..\xml\av\_all\phl_av_qhd_lsc_tch\display_eur_compData.xml, 
-// which was generated with timestamp 2009-12-11 18:33:56.825
+// which was generated with timestamp 2009-12-29 15:55:20.513
 
 Name: AknLayoutScalable_Avkon
 Version: 1.0
@@ -12281,3 +12281,141 @@
 // LAF Table : main_ai5_sk_pane
 TAknWindowComponentLayout main_ai5_sk_pane_g1(TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
 
+// LAF Table : popup_query_code_window
+TAknWindowComponentLayout popup_query_code_window_g1(TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+// LAF Table : main_fep_vtchi_ss_pane
+TAknWindowComponentLayout popup_fep_vkb_icf_pane(TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+TAknWindowComponentLayout popup_fep_vtchi_icf_pane(TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+// LAF Table : popup_fep_vkb_icf_pane
+TAknWindowComponentLayout bg_icf_pane(TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+TAknWindowComponentLayout list_vkb_icf_pane(TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+// LAF Table : popup_fep_vtchi_icf_pane
+TAknWindowComponentLayout bg_icf_pane_cp01(TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+TAknWindowComponentLayout vtchi_icf_list_pane(TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+// LAF Table : list_vkb_icf_pane
+TAknLayoutScalableParameterLimits list_vkb_icf_pane_t1_ParamLimits(TInt aVariety = 0);
+
+TAknTextComponentLayout list_vkb_icf_pane_t1(TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+// LAF Table : vtchi_icf_list_pane
+TAknLayoutScalableParameterLimits vtchi_icf_list_pane_t1_ParamLimits(TInt aVariety = 0);
+
+TAknTextComponentLayout vtchi_icf_list_pane_t1(TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+// LAF Table : main_fep_vtchi_ss_pane
+TAknLayoutScalableParameterLimits popup_fep_ituss_window_ParamLimits(TInt aVariety);
+
+TAknLayoutScalableParameterLimits popup_fep_vtchi_icf_pane_ParamLimits(TInt aVariety);
+
+// LAF Table : popup_fep_ituss_window
+TAknLayoutScalableParameterLimits ituss_keypad_pane_ParamLimits(TInt aVariety);
+
+TAknWindowComponentLayout ituss_sks_pane(TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+// LAF Table : popup_fep_vkb_icf_pane
+TAknLayoutScalableParameterLimits bg_icf_pane_ParamLimits(TInt aVariety);
+
+TAknLayoutScalableParameterLimits icf_edit_indi_pane_ParamLimits(TInt aVariety);
+
+TAknWindowComponentLayout icf_edit_indi_pane(TInt aVariety, TInt aCol = 0, TInt aRow = 0);
+
+TAknLayoutScalableParameterLimits list_vkb_icf_pane_ParamLimits(TInt aVariety);
+
+// LAF Table : popup_fep_vtchi_icf_pane
+TAknLayoutScalableParameterLimits bg_icf_pane_cp01_ParamLimits(TInt aVariety);
+
+TAknLayoutScalableParameterLimits icf_edit_indi_pane_cp01_ParamLimits(TInt aVariety);
+
+TAknWindowComponentLayout icf_edit_indi_pane_cp01(TInt aVariety, TInt aCol = 0, TInt aRow = 0);
+
+TAknWindowComponentLayout vtchi_query_pane(TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+// LAF Table : icf_edit_indi_pane
+TAknLayoutScalableParameterLimits icf_edit_indi_pane_g1_ParamLimits(TInt aVariety);
+
+TAknWindowComponentLayout icf_edit_indi_pane_g1(TInt aVariety, TInt aCol = 0, TInt aRow = 0);
+
+TAknLayoutScalableParameterLimits icf_edit_indi_pane_g2_ParamLimits(TInt aVariety);
+
+TAknWindowComponentLayout icf_edit_indi_pane_g2(TInt aVariety, TInt aCol = 0, TInt aRow = 0);
+
+TAknLayoutScalableTableLimits icf_edit_indi_pane_g_Limits();
+
+TAknLayoutScalableParameterLimits icf_edit_indi_pane_g_ParamLimits(TInt aLineIndex, TInt aVariety);
+
+TAknWindowComponentLayout icf_edit_indi_pane_g(TInt aLineIndex, TInt aVariety, TInt aCol = 0, TInt aRow = 0);
+
+TAknTextComponentLayout icf_edit_indi_pane_t1(TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+// LAF Table : vtchi_query_pane
+TAknWindowComponentLayout bg_input_focus_pane_cp042(TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+TAknWindowComponentLayout vtchi_button_pane(TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+TAknTextComponentLayout vtchi_query_pane_t1(TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+TAknTextComponentLayout vtchi_query_pane_t2(TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+TAknTextComponentLayout vtchi_query_pane_t3(TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+TAknLayoutScalableTableLimits vtchi_query_pane_t_Limits();
+
+TAknTextComponentLayout vtchi_query_pane_t(TInt aLineIndex, TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+// LAF Table : vtchi_button_pane
+TAknWindowComponentLayout bg_button_pane_cp13(TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+TAknWindowComponentLayout vtchi_button_pane_g1(TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+// LAF Table : ituss_sks_pane
+TAknWindowComponentLayout ituss_sks_pane_g1(TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+TAknWindowComponentLayout ituss_sks_pane_g2(TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+TAknLayoutScalableTableLimits ituss_sks_pane_g_Limits();
+
+TAknWindowComponentLayout ituss_sks_pane_g(TInt aLineIndex, TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+TAknTextComponentLayout ituss_sks_pane_t1(TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+TAknTextComponentLayout ituss_sks_pane_t2(TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+TAknLayoutScalableTableLimits ituss_sks_pane_t_Limits();
+
+TAknTextComponentLayout ituss_sks_pane_t(TInt aLineIndex, TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+// LAF Table : indicator_nsta_pane_cp
+TAknWindowComponentLayout indicator_nsta_pane_cp_g1(TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+TAknWindowComponentLayout indicator_nsta_pane_cp_g2(TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+TAknWindowComponentLayout indicator_nsta_pane_cp_g3(TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+TAknWindowComponentLayout indicator_nsta_pane_cp_g4(TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+TAknWindowComponentLayout indicator_nsta_pane_cp_g5(TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+TAknWindowComponentLayout indicator_nsta_pane_cp_g6(TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+TAknLayoutScalableTableLimits indicator_nsta_pane_cp_g_Limits();
+
+TAknWindowComponentLayout indicator_nsta_pane_cp_g(TInt aLineIndex, TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
+
+// LAF Table : cell_graphic2_pane
+TAknLayoutScalableParameterLimits cell_graphic2_pane_t2_ParamLimits(TInt aVariety);
+
+TAknTextComponentLayout cell_graphic2_pane_t2(TInt aVariety, TInt aCol = 0, TInt aRow = 0);
+
+TAknLayoutScalableTableLimits cell_graphic2_pane_t_Limits();
+
+TAknLayoutScalableParameterLimits cell_graphic2_pane_t_ParamLimits(TInt aLineIndex, TInt aVariety);
+
+TAknTextComponentLayout cell_graphic2_pane_t(TInt aLineIndex, TInt aVariety, TInt aCol = 0, TInt aRow = 0);
+