From c446bdf886955c41734819893e6709179acb9cc2 Mon Sep 17 00:00:00 2001 From: Gilles Debunne Date: Thu, 27 Jan 2011 09:57:41 -0800 Subject: 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 --- core/res/res/color/widget_edittext_holo_dark.xml | 20 -- core/res/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 (limited to 'core') 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 4f3eb62..0000000 --- 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 7b950d4..0000000 --- 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 bf4f3bb..0000000 Binary files a/core/res/res/drawable-hdpi/btn_check_on_normal_holo_dark.png and /dev/null differ diff --git a/core/res/res/drawable-hdpi/btn_check_on_normal_holo_light.png b/core/res/res/drawable-hdpi/btn_check_on_normal_holo_light.png deleted file mode 100644 index 5a2a3c1..0000000 Binary files a/core/res/res/drawable-hdpi/btn_check_on_normal_holo_light.png and /dev/null differ 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 e65c0b4..0000000 Binary files a/core/res/res/drawable-mdpi/btn_check_on_normal_holo_dark.png and /dev/null differ 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 9576bea..0000000 Binary files a/core/res/res/drawable-mdpi/btn_check_on_normal_holo_light.png and /dev/null differ diff --git a/core/res/res/values/arrays.xml b/core/res/res/values/arrays.xml index 04c6538..fa33b0a 100644 --- a/core/res/res/values/arrays.xml +++ b/core/res/res/values/arrays.xml @@ -22,51 +22,248 @@ - @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 1534101..b828318 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -1239,7 +1239,7 @@ @@ -1351,7 +1351,7 @@ -- cgit v1.1