From c446bdf886955c41734819893e6709179acb9cc2 Mon Sep 17 00:00:00 2001 From: Gilles Debunne Date: Thu, 27 Jan 2011 09:57:41 -0800 Subject: [PATCH] Refresh the list of preloaded drawables and color state lists Bug 3266751 The boot time is 43 compared to 44 seconds, which is within the precision of the measure. Starting 15 activities in a sequence takes 20-24 seconds with the old version and 17-18 seconds with the new pre-load (12/13 when ran a second time, all apps being loaded). The standard deviation is high, but it seems consistently better. Change-Id: Ieac3cb93be03e8186979b894adda29f0549b9734 --- .../res/color/widget_edittext_holo_dark.xml | 20 -- .../res/color/widget_edittext_holo_light.xml | 20 -- .../btn_check_on_normal_holo_dark.png | Bin 1655 -> 0 bytes .../btn_check_on_normal_holo_light.png | Bin 884 -> 0 bytes .../btn_check_on_normal_holo_dark.png | Bin 1027 -> 0 bytes .../btn_check_on_normal_holo_light.png | Bin 613 -> 0 bytes core/res/res/values/arrays.xml | 311 +++++++++++++++--- core/res/res/values/styles.xml | 4 +- 8 files changed, 264 insertions(+), 91 deletions(-) delete mode 100644 core/res/res/color/widget_edittext_holo_dark.xml delete mode 100644 core/res/res/color/widget_edittext_holo_light.xml delete mode 100644 core/res/res/drawable-hdpi/btn_check_on_normal_holo_dark.png delete mode 100644 core/res/res/drawable-hdpi/btn_check_on_normal_holo_light.png delete mode 100644 core/res/res/drawable-mdpi/btn_check_on_normal_holo_dark.png delete mode 100644 core/res/res/drawable-mdpi/btn_check_on_normal_holo_light.png diff --git a/core/res/res/color/widget_edittext_holo_dark.xml b/core/res/res/color/widget_edittext_holo_dark.xml deleted file mode 100644 index 4f3eb62dfd323..0000000000000 --- a/core/res/res/color/widget_edittext_holo_dark.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - diff --git a/core/res/res/color/widget_edittext_holo_light.xml b/core/res/res/color/widget_edittext_holo_light.xml deleted file mode 100644 index 7b950d4671025..0000000000000 --- a/core/res/res/color/widget_edittext_holo_light.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - diff --git a/core/res/res/drawable-hdpi/btn_check_on_normal_holo_dark.png b/core/res/res/drawable-hdpi/btn_check_on_normal_holo_dark.png deleted file mode 100644 index bf4f3bb6b0303e89df1bf36da94eed0b32afde8a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1655 zcmV--28j8IP)~`ay zuF4y6c(_@1+XJ}L-F`uJTB$6xvhIzO@pB_i!37swaKQx^TyPe2?t``kd;@$9%s_lW zy9!u~ld^M!;K(;HNb(4$<}wbI z4K}Sz*@PuL@?SUQ&PO5lC}aj~*$FbX_4@GlKQ8q;dcA7LeARlrjjX#UA6t2$++&b2 zAT;u!LNlRVwz#S(p46^=l~a6`b3Co5`(OM<62r+M#95VWGZ|A9i?C#u4*fQcdE1V8 zJ1u!TE%kcp^`@1VmURp}V=WL8F}$KyEp`=}bBgPn<7w~hpj}(2mOR=0R3ZeH?iYzK zLB>wZ2(M#*)eimTbjTO;F>mH2U(LPV&gnxdADf*qDw_pz&@8nI?Xqc~Q#@IEdmC9@ zE`x*eA`ue8`gDnZNSKjcMzTBOZh6@bc{3gQi}{D=zyHJa{ByJ+#_i6V(bubw3@{oLTUDv5 zBy0Oy{D4e#6-g;&Tb4f~{XeUk)!J)8R#MgFst1vAm5Q!Zu6r0Zl7_GPD&iQ24mLfFScnnrGmDnZTEe|47yG7ciJyj?ynok18 zxvk75GVe(>#;A*_UBSMKs|OvL^3{U(9d3823 zZ|34Kn`0|_gA7w*SY{E1R>72Fm%)Asu9v8%i@5Hv&(N-l~aOArPjw-Qr{DTAvFp7ik3F0Q)R=c>wh2q4=WzL`ug8`&o8 z+!xe3eaN9X;VNKhCNULI@_S{*B1$x1&R|#azTi6XRhoSb`ANpwl>BhMqWK*Rb;eGC ze+_(F?i$yk@-gavsWaSDXVg5ZRyZ^}G;$?0d1z|<1@vdBy%Pi_{qR_xF`&>yI)Qi& zb!t1-nY~G%P^#7f4mH#?dwq83W+&BhRIO$y*6Y+s#B=Z_nQ04|g;j_P%`PuDpc_2$ zdKfv(wNcO*^GK|&uMgrsXg=v^YjZT3J)e@^gy#E)=J7Gf+yXxv?hcyvF89?d%~o+= ze0XH7`LzF|k$J%ou-}R2p^5(_(Ah;$pKL`o{tEEooCp7}exJGEf(tIV;DQUz#J>Tk zm$>|W!&cM)001R)MObuXVRU6WV{&C-bY%cCFflMKFgYzVFjO%zIxsOhFgGnQH##sd zYZybn0000bbVXQnWMOn=I&E)cX=ZrLdrmSIkz%Q{N<ePCuh%7)OLLdJpEOM>?DQ*3c@^JZY&$2E*c%+syz9NI;NxYBPj?u1*cKaH z*|m1weXU&~lfEz?xIHm};eq0h znz(t-BXq=?52i$xaXdDWjY;gwGMgQ$n)`lbV4m=Iro+?Z<>da|me-efUBj8#yXn_L zW*!HLV+K8r#}<69GGXB1^pMW^B7QWjb5YDeKmF_9IE9KkRc0wYQ#~P=$gtpw6i{aU z{`>jOZT?*9D%M@**X0vu95AS4Gyc8BvDIVSvJsA}HG_x@0quY&uGpxxU_y3Zyid^;%R z&}(4*bb*RML!r0RIqu}nvVer>6@pDwE`{f3`R{OkGi_t@|ENPfX9E{+b@n&eAKTS8 zbJc9k{Ny?VeILeU(|QZ5j#tH(?RkD?CF_FOvhQ+wS(ATXI`H8omppzyZfpG5cz#c3@3i0sJ%_J9&n!MyZ1>sMdCqwj zRxn`v&v0P!MEfI8!@dF&q-u$4L`h0wNvc(HQ7VvPFfuSS&^55sH8uz_G_o=ft867M1%6zjR`;vk{}y`^V3So6N^$A98>a>QWZRN c6Vp?JQWH}u3s0un02MKKy85}Sb4q9e03N$-NdN!< diff --git a/core/res/res/drawable-mdpi/btn_check_on_normal_holo_dark.png b/core/res/res/drawable-mdpi/btn_check_on_normal_holo_dark.png deleted file mode 100644 index e65c0b4b5b138dd117b156099f7a5d95ddfbb805..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1027 zcmeAS@N?(olHy`uVBq!ia0vp^N+8U^1|+TAxeoy;wj^(N7l!{JxM1({$v_d#0*}aI zAngIhZYQ(tK!Rljj_E)ete@crOS}jJ12em)i(^Q{;kRMdeRteM)>Pg7lTmInZL86o z8!KxWvorb9Jv zzqv?EW@s|Wd9S3yT(K$k%eN3EZw3xgufBkV*(tq^g2K*IoANsumo$19q|MxV>YDb( z$r~AGCgf~cTWK`WMEfDb4;}?hVB9zEzz~J>M+OTm$N&M!$ z|KqsYxEMd>{rJ3n;kr)||FhKgpEfnqG>JUH%h03QlbcfgBsc1sp1o%6zLlr{wa;gq zcuK*SUx|rh-Ncrg$3Obsn{xf_vOO=||6jQJV@j;^zeyfR@tb3>>e2SL7H8qA*Ctm> z=ed_3QuHaEE4}V=*(-^nWwtqdT1plS8?N+<%J-RVd*rNlXU2m$*>e`2NM|+<(|=}n zbEC^0_0>9Roz}v4+8=XY=jyj8v$SD~dwuaWzlKq?si&)gh|R3dCP9ZY>8EqPKNoal znkbT|xODOM6&|K3jw)}nY-e;Bo}A&Dc5<`x+mBJz(MR7Lb7L}^nL0M zx&EgIcgQvFn`Ju5CtcG?YSULGofq9n55jp?iov$?P+T{m`~pK4?V)^ zoznDVdxHjx>hh51zr_z`qZiX4Tzd~I19jzA^El<5axu#lc;(t?{ z_=1D1%OB-O^uJqfo}#M-%pa;Ht`Q|Ei6yC4$wjF^iowXh&_LI~QrFlZ#L&pfz|hLT zT-U(d%D^C7!g)W6hTQy=%(O~$4F*;wMi33kUpFQIHAsSN2+mI{DNig)WpGT%PfAtr d%uP&B4N6T+sVqF1Y6Dcn;OXk;vd$@?2>`OFqQU?G diff --git a/core/res/res/drawable-mdpi/btn_check_on_normal_holo_light.png b/core/res/res/drawable-mdpi/btn_check_on_normal_holo_light.png deleted file mode 100644 index 9576bea6401e888944467b29bfcd40d12d355df8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 613 zcmeAS@N?(olHy`uVBq!ia0vp^N+8U^1|+TAxeoy;wj^(N7l!{JxM1({$v_d#0*}aI zAngIhZYQ(tK!Rljj_E)ete@crOS}jJ17oJAi(^Q{;kVNa{SG?_xZa;%>fs~YDVFz0 z?fXL|k(CRZS1(a8XS8Zr;K{PF{g4}{fOT08H&^}1DDln4=j+{HH##=6m8z7>@BBS= zw|!-`t>{j-;|*u58Gfv+jI<4HuwhP@mHw-gnSV}8;D1%Tj@a5&=hHUlI%ejdU6Hp* z#k0Vu;QVziPG-(To$05eer7i}O#U_N`&sSGZO1yt-K15IAa9XWX;McYR~I8E!lf%xp4(hnT{B`U`!a&jxNgi120x?h)a z3HsO|IfFBj(_>rj`;!x6SG@gon%A_L`M@hSFHzf#<;=Y@D|s(%mufQEvV>p2Goty4 zoBvs@o`j#iFGYN3mOtBWQGQ&u>FCeU`=%U1k2AcA>YQh-<%{`f_&6h~?(;TALsk*L zPMy3jmtV^)d8<+2@juOA)u(ss+WGhA?nzFssQYvIVdaGdj;g;{e$I`wKNPDp0~iCU zC9V-ADTyViR>?)FK#IZ0z|cU~z*5)PAjHtf%D~Xdz+BhB+{(ZpTf%uiiiX_$l+3hB zbPWbpCPokq%3n7o05wR0YzWRzD=AMbN@Z|N$xljE@XSq2PYp^ - @drawable/sym_def_app_icon - @drawable/arrow_down_float - @drawable/btn_check - @drawable/btn_check_label_background - @drawable/btn_check_off - @drawable/btn_check_on - @drawable/btn_default - @drawable/btn_default_small - @drawable/btn_dropdown - @drawable/btn_plus - @drawable/btn_minus - @drawable/btn_radio - @drawable/btn_star - @drawable/btn_toggle - @drawable/ic_emergency - @drawable/divider_horizontal_bright - @drawable/divider_horizontal_dark - @drawable/edit_text - @drawable/expander_group - @drawable/list_selector_background - @drawable/menu_background - @drawable/menu_background_fill_parent_width - @drawable/menu_selector - @drawable/panel_background - @drawable/popup_bottom_bright - @drawable/popup_bottom_dark - @drawable/popup_bottom_medium - @drawable/popup_center_bright - @drawable/popup_center_dark - @drawable/popup_full_dark - @drawable/popup_top_bright - @drawable/popup_top_dark - @drawable/progress_horizontal - @drawable/progress_indeterminate_horizontal - @drawable/progress_small - @drawable/progress_small_titlebar - @drawable/screen_background_dark - @drawable/screen_background_light - @drawable/scrollbar_handle_horizontal - @drawable/scrollbar_handle_vertical - @drawable/spinner_dropdown_background - @drawable/text_select_handle_left - @drawable/text_select_handle_middle - @drawable/text_select_handle_right - @drawable/title_bar + @drawable/btn_check_on_selected + @drawable/btn_check_on_pressed_holo_light + @drawable/btn_check_on_pressed_holo_dark + @drawable/btn_check_on_pressed + @drawable/btn_check_on_holo_light + @drawable/btn_check_on_holo_dark + @drawable/btn_check_on_focused_holo_light + @drawable/btn_check_on_focused_holo_dark + @drawable/btn_check_on_disabled_holo_light + @drawable/btn_check_on_disabled_holo_dark + @drawable/btn_check_on_disabled_focused_holo_light + @drawable/btn_check_on_disabled_focused_holo_dark + @drawable/btn_check_on_disable_focused + @drawable/btn_check_on_disable + @drawable/btn_check_on + @drawable/btn_check_off_selected + @drawable/btn_check_off_pressed_holo_light + @drawable/btn_check_off_pressed_holo_dark + @drawable/btn_check_off_pressed + @drawable/btn_check_off_holo_light + @drawable/btn_check_off_holo_dark + @drawable/btn_check_off_focused_holo_light + @drawable/btn_check_off_focused_holo_dark + @drawable/btn_check_off_disabled_holo_light + @drawable/btn_check_off_disabled_holo_dark + @drawable/btn_check_off_disabled_focused_holo_light + @drawable/btn_check_off_disabled_focused_holo_dark + @drawable/btn_check_off_disable_focused + @drawable/btn_check_off_disable + @drawable/btn_check_off + @drawable/btn_radio_on_selected + @drawable/btn_radio_on_pressed_holo_light + @drawable/btn_radio_on_pressed_holo_dark + @drawable/btn_radio_on_pressed + @drawable/btn_radio_on_holo_light + @drawable/btn_radio_on_holo_dark + @drawable/btn_radio_on_focused_holo_light + @drawable/btn_radio_on_focused_holo_dark + @drawable/btn_radio_on_disabled_holo_light + @drawable/btn_radio_on_disabled_holo_dark + @drawable/btn_radio_on_disabled_focused_holo_light + @drawable/btn_radio_on_disabled_focused_holo_dark + @drawable/btn_radio_on + @drawable/btn_radio_off_selected + @drawable/btn_radio_off_pressed_holo_light + @drawable/btn_radio_off_pressed_holo_dark + @drawable/btn_radio_off_pressed + @drawable/btn_radio_off_holo_light + @drawable/btn_radio_off_holo_dark + @drawable/btn_radio_off_focused_holo_light + @drawable/btn_radio_off_focused_holo_dark + @drawable/btn_radio_off_disabled_holo_light + @drawable/btn_radio_off_disabled_holo_dark + @drawable/btn_radio_off_disabled_focused_holo_light + @drawable/btn_radio_off_disabled_focused_holo_dark + @drawable/btn_radio_off + @drawable/btn_default_transparent_normal + @drawable/btn_default_small_selected + @drawable/btn_default_small_pressed_holo_light + @drawable/btn_default_small_pressed_holo_dark + @drawable/btn_default_small_pressed + @drawable/btn_default_small_normal_holo_light + @drawable/btn_default_small_normal_holo_dark + @drawable/btn_default_small_normal_disable_focused + @drawable/btn_default_small_normal_disable + @drawable/btn_default_small_normal + @drawable/btn_default_small_focused_holo_light + @drawable/btn_default_small_focused_holo_dark + @drawable/btn_default_small_disabled_holo_light + @drawable/btn_default_small_disabled_holo_dark + @drawable/btn_default_small_disabled_focused_holo_light + @drawable/btn_default_small_disabled_focused_holo_dark + @drawable/btn_default_selected + @drawable/btn_default_pressed_holo_light + @drawable/btn_default_pressed_holo_dark + @drawable/btn_default_pressed + @drawable/btn_default_normal_holo_light + @drawable/btn_default_normal_holo_dark + @drawable/btn_default_normal_disable_focused + @drawable/btn_default_normal_disable + @drawable/btn_default_normal + @drawable/btn_default_focused_holo_light + @drawable/btn_default_focused_holo_dark + @drawable/btn_default_disabled_holo_light + @drawable/btn_default_disabled_holo_dark + @drawable/btn_default_disabled_focused_holo_light + @drawable/btn_default_disabled_focused_holo_dark + @drawable/btn_toggle_on_pressed_holo_light + @drawable/btn_toggle_on_pressed_holo_dark + @drawable/btn_toggle_on_normal_holo_light + @drawable/btn_toggle_on_normal_holo_dark + @drawable/btn_toggle_on_focused_holo_light + @drawable/btn_toggle_on_focused_holo_dark + @drawable/btn_toggle_on_disabled_holo_light + @drawable/btn_toggle_on_disabled_holo_dark + @drawable/btn_toggle_on_disabled_focused_holo_light + @drawable/btn_toggle_on_disabled_focused_holo_dark + @drawable/btn_toggle_on + @drawable/btn_toggle_off_pressed_holo_light + @drawable/btn_toggle_off_pressed_holo_dark + @drawable/btn_toggle_off_normal_holo_light + @drawable/btn_toggle_off_normal_holo_dark + @drawable/btn_toggle_off_focused_holo_light + @drawable/btn_toggle_off_focused_holo_dark + @drawable/btn_toggle_off_disabled_holo_light + @drawable/btn_toggle_off_disabled_holo_dark + @drawable/btn_toggle_off_disabled_focused_holo_light + @drawable/btn_toggle_off_disabled_focused_holo_dark + @drawable/btn_toggle_off + @drawable/ic_emergency + @drawable/divider_horizontal_textfield + @drawable/divider_horizontal_dark_opaque + @drawable/divider_horizontal_dark + @drawable/divider_horizontal_bright_opaque + @drawable/divider_horizontal_bright + @drawable/divider_vertical_dark + @drawable/edit_text_holo_light + @drawable/edit_text_holo_dark + @drawable/edit_text + @drawable/expander_group + @drawable/expander_group_holo_dark + @drawable/expander_group_holo_light + @drawable/list_selector_background + @drawable/list_selector_background_light + @drawable/list_selector_background_longpress + @drawable/list_selector_background_longpress_light + @drawable/list_selector_background_pressed + @drawable/list_selector_background_pressed_light + @drawable/list_selector_background_selected + @drawable/list_selector_holo_dark + @drawable/list_selector_holo_light + @drawable/menu_background + @drawable/menu_background_fill_parent_width + @drawable/menu_submenu_background + @drawable/menu_selector + @drawable/panel_background + @drawable/popup_bottom_bright + @drawable/popup_bottom_dark + @drawable/popup_bottom_medium + @drawable/popup_center_bright + @drawable/popup_center_dark + @drawable/popup_center_medium + @drawable/popup_full_bright + @drawable/popup_full_dark + @drawable/popup_top_bright + @drawable/popup_top_dark + @drawable/popup_inline_error_above_holo_dark + @drawable/popup_inline_error_above_holo_light + @drawable/popup_inline_error_holo_dark + @drawable/popup_inline_error_holo_light + @drawable/progress_bg_holo_dark + @drawable/progress_bg_holo_light + @drawable/progress_horizontal + @drawable/progress_horizontal_holo_dark + @drawable/progress_horizontal_holo_light + @drawable/progress_indeterminate_horizontal + @drawable/progress_indeterminate_horizontal_holo + @drawable/progress_large + @drawable/progress_large_holo + @drawable/progress_large_white + @drawable/progress_medium + @drawable/progress_medium_holo + @drawable/progress_medium_white + @drawable/progress_primary_holo_dark + @drawable/progress_primary_holo_light + @drawable/progress_secondary_holo_dark + @drawable/progress_secondary_holo_light + @drawable/progress_small + @drawable/progress_small_holo + @drawable/progress_small_titlebar + @drawable/progress_small_white + @drawable/scrubber_progress_horizontal_holo_dark + @drawable/scrubber_progress_horizontal_holo_light + @drawable/screen_background_dark + @drawable/screen_background_dark_transparent + @drawable/screen_background_light + @drawable/screen_background_light_transparent + @drawable/screen_background_selector_dark + @drawable/screen_background_selector_light + @drawable/scrollbar_handle_holo_dark + @drawable/scrollbar_handle_holo_light + @drawable/scrollbar_handle_horizontal + @drawable/scrollbar_handle_vertical + @drawable/spinner_background_holo_dark + @drawable/spinner_background_holo_light + @drawable/spinner_cab_default_holo_dark + @drawable/spinner_cab_default_holo_light + @drawable/spinner_cab_disabled_holo_dark + @drawable/spinner_cab_disabled_holo_light + @drawable/spinner_cab_focused_holo_dark + @drawable/spinner_cab_focused_holo_light + @drawable/spinner_cab_pressed_holo_dark + @drawable/spinner_cab_pressed_holo_light + @drawable/spinner_default_holo_dark + @drawable/spinner_default_holo_light + @drawable/spinner_disabled_holo_dark + @drawable/spinner_disabled_holo_light + @drawable/spinner_dropdown_background + @drawable/spinner_dropdown_background_down + @drawable/spinner_dropdown_background_up + @drawable/spinner_focused_holo_dark + @drawable/spinner_focused_holo_light + @drawable/spinner_normal + @drawable/spinner_press + @drawable/spinner_pressed_holo_dark + @drawable/spinner_pressed_holo_light + @drawable/spinner_select + @drawable/btn_cab_done + @drawable/btn_cab_done_focused_holo + @drawable/btn_cab_done_holo + @drawable/btn_cab_done_pressed_holo + @drawable/cab_background_light + @drawable/cab_ic_close_focused_holo + @drawable/cab_ic_close_holo + @drawable/cab_ic_close_normal_holo + @drawable/cab_ic_close_pressed_holo + @drawable/ic_cab_close_holo + @drawable/action_bar_background + @drawable/action_bar_divider + @drawable/ic_menu_close_clear_cancel + @drawable/ic_menu_copy_dark + @drawable/ic_menu_copy_light + @drawable/ic_menu_cut_dark + @drawable/ic_menu_cut_light + @drawable/ic_menu_more + @drawable/ic_menu_moreoverflow_holo_dark + @drawable/ic_menu_moreoverflow_holo_light + @drawable/ic_menu_paste_dark + @drawable/ic_menu_paste_light + @drawable/dialog_bottom_holo_dark + @drawable/dialog_bottom_holo_light + @drawable/dialog_full_holo_dark + @drawable/dialog_full_holo_light + @drawable/dialog_middle_holo_dark + @drawable/dialog_middle_holo_light + @drawable/dialog_top_holo_dark + @drawable/dialog_top_holo_light + @drawable/ic_dialog_alert + @drawable/ic_dialog_alert_holo_dark + @drawable/ic_dialog_alert_holo_light + @drawable/list_divider_holo_dark + @drawable/list_divider_holo_light @drawable/indicator_code_lock_drag_direction_green_up @drawable/indicator_code_lock_drag_direction_red_up @@ -78,18 +275,34 @@ - @color/hint_foreground_dark - @color/hint_foreground_light @color/primary_text_dark @color/primary_text_dark_disable_only + @color/primary_text_dark_nodisable + @color/primary_text_disable_only_holo_dark + @color/primary_text_disable_only_holo_light + @color/primary_text_holo_dark + @color/primary_text_holo_light @color/primary_text_light @color/primary_text_light_disable_only @color/primary_text_light_nodisable + @color/primary_text_nodisable_holo_dark + @color/primary_text_nodisable_holo_light @color/secondary_text_dark + @color/secondary_text_dark_nodisable + @color/secondary_text_holo_dark + @color/secondary_text_holo_light @color/secondary_text_light + @color/secondary_text_light_nodisable + @color/secondary_text_nodisable_holo_dark + @color/secondary_text_nodisable_holo_light + @color/secondary_text_nofocus + @color/hint_foreground_dark + @color/hint_foreground_holo_dark + @color/hint_foreground_holo_light + @color/hint_foreground_light + @color/bright_foreground_light + @color/bright_foreground_dark @color/tab_indicator_text - @color/tertiary_text_dark - @color/tertiary_text_light #ff000000 #00000000 #ffffffff diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index 15341015cb764..b828318c69887 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -1239,7 +1239,7 @@ @@ -1351,7 +1351,7 @@