Merge "Refresh the list of preloaded drawables and color state lists" into honeycomb

This commit is contained in:
Gilles Debunne
2011-01-27 11:07:04 -08:00
committed by Android (Google) Code Review
8 changed files with 264 additions and 91 deletions

View File

@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2010 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="false" android:color="@android:color/bright_foreground_light"/> <!-- unfocused -->
<item android:color="@android:color/bright_foreground_light"/>
</selector>

View File

@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2010 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="false" android:color="@android:color/bright_foreground_dark"/> <!-- unfocused -->
<item android:color="@android:color/bright_foreground_dark"/>
</selector>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 884 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 613 B

View File

@@ -22,51 +22,248 @@
<!-- Do not translate. These are all of the drawable resources that should be preloaded by <!-- Do not translate. These are all of the drawable resources that should be preloaded by
the zygote process before it starts forking application processes. --> the zygote process before it starts forking application processes. -->
<array name="preloaded_drawables"> <array name="preloaded_drawables">
<item>@drawable/sym_def_app_icon</item> <item>@drawable/btn_check_on_selected</item>
<item>@drawable/arrow_down_float</item> <item>@drawable/btn_check_on_pressed_holo_light</item>
<item>@drawable/btn_check</item> <item>@drawable/btn_check_on_pressed_holo_dark</item>
<item>@drawable/btn_check_label_background</item> <item>@drawable/btn_check_on_pressed</item>
<item>@drawable/btn_check_off</item> <item>@drawable/btn_check_on_holo_light</item>
<item>@drawable/btn_check_on</item> <item>@drawable/btn_check_on_holo_dark</item>
<item>@drawable/btn_default</item> <item>@drawable/btn_check_on_focused_holo_light</item>
<item>@drawable/btn_default_small</item> <item>@drawable/btn_check_on_focused_holo_dark</item>
<item>@drawable/btn_dropdown</item> <item>@drawable/btn_check_on_disabled_holo_light</item>
<item>@drawable/btn_plus</item> <item>@drawable/btn_check_on_disabled_holo_dark</item>
<item>@drawable/btn_minus</item> <item>@drawable/btn_check_on_disabled_focused_holo_light</item>
<item>@drawable/btn_radio</item> <item>@drawable/btn_check_on_disabled_focused_holo_dark</item>
<item>@drawable/btn_star</item> <item>@drawable/btn_check_on_disable_focused</item>
<item>@drawable/btn_toggle</item> <item>@drawable/btn_check_on_disable</item>
<item>@drawable/ic_emergency</item> <item>@drawable/btn_check_on</item>
<item>@drawable/divider_horizontal_bright</item> <item>@drawable/btn_check_off_selected</item>
<item>@drawable/divider_horizontal_dark</item> <item>@drawable/btn_check_off_pressed_holo_light</item>
<item>@drawable/edit_text</item> <item>@drawable/btn_check_off_pressed_holo_dark</item>
<item>@drawable/expander_group</item> <item>@drawable/btn_check_off_pressed</item>
<item>@drawable/list_selector_background</item> <item>@drawable/btn_check_off_holo_light</item>
<item>@drawable/menu_background</item> <item>@drawable/btn_check_off_holo_dark</item>
<item>@drawable/menu_background_fill_parent_width</item> <item>@drawable/btn_check_off_focused_holo_light</item>
<item>@drawable/menu_selector</item> <item>@drawable/btn_check_off_focused_holo_dark</item>
<item>@drawable/panel_background</item> <item>@drawable/btn_check_off_disabled_holo_light</item>
<item>@drawable/popup_bottom_bright</item> <item>@drawable/btn_check_off_disabled_holo_dark</item>
<item>@drawable/popup_bottom_dark</item> <item>@drawable/btn_check_off_disabled_focused_holo_light</item>
<item>@drawable/popup_bottom_medium</item> <item>@drawable/btn_check_off_disabled_focused_holo_dark</item>
<item>@drawable/popup_center_bright</item> <item>@drawable/btn_check_off_disable_focused</item>
<item>@drawable/popup_center_dark</item> <item>@drawable/btn_check_off_disable</item>
<item>@drawable/popup_full_dark</item> <item>@drawable/btn_check_off</item>
<item>@drawable/popup_top_bright</item> <item>@drawable/btn_radio_on_selected</item>
<item>@drawable/popup_top_dark</item> <item>@drawable/btn_radio_on_pressed_holo_light</item>
<item>@drawable/progress_horizontal</item> <item>@drawable/btn_radio_on_pressed_holo_dark</item>
<item>@drawable/progress_indeterminate_horizontal</item> <item>@drawable/btn_radio_on_pressed</item>
<item>@drawable/progress_small</item> <item>@drawable/btn_radio_on_holo_light</item>
<item>@drawable/progress_small_titlebar</item> <item>@drawable/btn_radio_on_holo_dark</item>
<item>@drawable/screen_background_dark</item> <item>@drawable/btn_radio_on_focused_holo_light</item>
<item>@drawable/screen_background_light</item> <item>@drawable/btn_radio_on_focused_holo_dark</item>
<item>@drawable/scrollbar_handle_horizontal</item> <item>@drawable/btn_radio_on_disabled_holo_light</item>
<item>@drawable/scrollbar_handle_vertical</item> <item>@drawable/btn_radio_on_disabled_holo_dark</item>
<item>@drawable/spinner_dropdown_background</item> <item>@drawable/btn_radio_on_disabled_focused_holo_light</item>
<item>@drawable/text_select_handle_left</item> <item>@drawable/btn_radio_on_disabled_focused_holo_dark</item>
<item>@drawable/text_select_handle_middle</item> <item>@drawable/btn_radio_on</item>
<item>@drawable/text_select_handle_right</item> <item>@drawable/btn_radio_off_selected</item>
<item>@drawable/title_bar</item> <item>@drawable/btn_radio_off_pressed_holo_light</item>
<item>@drawable/btn_radio_off_pressed_holo_dark</item>
<item>@drawable/btn_radio_off_pressed</item>
<item>@drawable/btn_radio_off_holo_light</item>
<item>@drawable/btn_radio_off_holo_dark</item>
<item>@drawable/btn_radio_off_focused_holo_light</item>
<item>@drawable/btn_radio_off_focused_holo_dark</item>
<item>@drawable/btn_radio_off_disabled_holo_light</item>
<item>@drawable/btn_radio_off_disabled_holo_dark</item>
<item>@drawable/btn_radio_off_disabled_focused_holo_light</item>
<item>@drawable/btn_radio_off_disabled_focused_holo_dark</item>
<item>@drawable/btn_radio_off</item>
<item>@drawable/btn_default_transparent_normal</item>
<item>@drawable/btn_default_small_selected</item>
<item>@drawable/btn_default_small_pressed_holo_light</item>
<item>@drawable/btn_default_small_pressed_holo_dark</item>
<item>@drawable/btn_default_small_pressed</item>
<item>@drawable/btn_default_small_normal_holo_light</item>
<item>@drawable/btn_default_small_normal_holo_dark</item>
<item>@drawable/btn_default_small_normal_disable_focused</item>
<item>@drawable/btn_default_small_normal_disable</item>
<item>@drawable/btn_default_small_normal</item>
<item>@drawable/btn_default_small_focused_holo_light</item>
<item>@drawable/btn_default_small_focused_holo_dark</item>
<item>@drawable/btn_default_small_disabled_holo_light</item>
<item>@drawable/btn_default_small_disabled_holo_dark</item>
<item>@drawable/btn_default_small_disabled_focused_holo_light</item>
<item>@drawable/btn_default_small_disabled_focused_holo_dark</item>
<item>@drawable/btn_default_selected</item>
<item>@drawable/btn_default_pressed_holo_light</item>
<item>@drawable/btn_default_pressed_holo_dark</item>
<item>@drawable/btn_default_pressed</item>
<item>@drawable/btn_default_normal_holo_light</item>
<item>@drawable/btn_default_normal_holo_dark</item>
<item>@drawable/btn_default_normal_disable_focused</item>
<item>@drawable/btn_default_normal_disable</item>
<item>@drawable/btn_default_normal</item>
<item>@drawable/btn_default_focused_holo_light</item>
<item>@drawable/btn_default_focused_holo_dark</item>
<item>@drawable/btn_default_disabled_holo_light</item>
<item>@drawable/btn_default_disabled_holo_dark</item>
<item>@drawable/btn_default_disabled_focused_holo_light</item>
<item>@drawable/btn_default_disabled_focused_holo_dark</item>
<item>@drawable/btn_toggle_on_pressed_holo_light</item>
<item>@drawable/btn_toggle_on_pressed_holo_dark</item>
<item>@drawable/btn_toggle_on_normal_holo_light</item>
<item>@drawable/btn_toggle_on_normal_holo_dark</item>
<item>@drawable/btn_toggle_on_focused_holo_light</item>
<item>@drawable/btn_toggle_on_focused_holo_dark</item>
<item>@drawable/btn_toggle_on_disabled_holo_light</item>
<item>@drawable/btn_toggle_on_disabled_holo_dark</item>
<item>@drawable/btn_toggle_on_disabled_focused_holo_light</item>
<item>@drawable/btn_toggle_on_disabled_focused_holo_dark</item>
<item>@drawable/btn_toggle_on</item>
<item>@drawable/btn_toggle_off_pressed_holo_light</item>
<item>@drawable/btn_toggle_off_pressed_holo_dark</item>
<item>@drawable/btn_toggle_off_normal_holo_light</item>
<item>@drawable/btn_toggle_off_normal_holo_dark</item>
<item>@drawable/btn_toggle_off_focused_holo_light</item>
<item>@drawable/btn_toggle_off_focused_holo_dark</item>
<item>@drawable/btn_toggle_off_disabled_holo_light</item>
<item>@drawable/btn_toggle_off_disabled_holo_dark</item>
<item>@drawable/btn_toggle_off_disabled_focused_holo_light</item>
<item>@drawable/btn_toggle_off_disabled_focused_holo_dark</item>
<item>@drawable/btn_toggle_off</item>
<item>@drawable/ic_emergency</item>
<item>@drawable/divider_horizontal_textfield</item>
<item>@drawable/divider_horizontal_dark_opaque</item>
<item>@drawable/divider_horizontal_dark</item>
<item>@drawable/divider_horizontal_bright_opaque</item>
<item>@drawable/divider_horizontal_bright</item>
<item>@drawable/divider_vertical_dark</item>
<item>@drawable/edit_text_holo_light</item>
<item>@drawable/edit_text_holo_dark</item>
<item>@drawable/edit_text</item>
<item>@drawable/expander_group</item>
<item>@drawable/expander_group_holo_dark</item>
<item>@drawable/expander_group_holo_light</item>
<item>@drawable/list_selector_background</item>
<item>@drawable/list_selector_background_light</item>
<item>@drawable/list_selector_background_longpress</item>
<item>@drawable/list_selector_background_longpress_light</item>
<item>@drawable/list_selector_background_pressed</item>
<item>@drawable/list_selector_background_pressed_light</item>
<item>@drawable/list_selector_background_selected</item>
<item>@drawable/list_selector_holo_dark</item>
<item>@drawable/list_selector_holo_light</item>
<item>@drawable/menu_background</item>
<item>@drawable/menu_background_fill_parent_width</item>
<item>@drawable/menu_submenu_background</item>
<item>@drawable/menu_selector</item>
<item>@drawable/panel_background</item>
<item>@drawable/popup_bottom_bright</item>
<item>@drawable/popup_bottom_dark</item>
<item>@drawable/popup_bottom_medium</item>
<item>@drawable/popup_center_bright</item>
<item>@drawable/popup_center_dark</item>
<item>@drawable/popup_center_medium</item>
<item>@drawable/popup_full_bright</item>
<item>@drawable/popup_full_dark</item>
<item>@drawable/popup_top_bright</item>
<item>@drawable/popup_top_dark</item>
<item>@drawable/popup_inline_error_above_holo_dark</item>
<item>@drawable/popup_inline_error_above_holo_light</item>
<item>@drawable/popup_inline_error_holo_dark</item>
<item>@drawable/popup_inline_error_holo_light</item>
<item>@drawable/progress_bg_holo_dark</item>
<item>@drawable/progress_bg_holo_light</item>
<item>@drawable/progress_horizontal</item>
<item>@drawable/progress_horizontal_holo_dark</item>
<item>@drawable/progress_horizontal_holo_light</item>
<item>@drawable/progress_indeterminate_horizontal</item>
<item>@drawable/progress_indeterminate_horizontal_holo</item>
<item>@drawable/progress_large</item>
<item>@drawable/progress_large_holo</item>
<item>@drawable/progress_large_white</item>
<item>@drawable/progress_medium</item>
<item>@drawable/progress_medium_holo</item>
<item>@drawable/progress_medium_white</item>
<item>@drawable/progress_primary_holo_dark</item>
<item>@drawable/progress_primary_holo_light</item>
<item>@drawable/progress_secondary_holo_dark</item>
<item>@drawable/progress_secondary_holo_light</item>
<item>@drawable/progress_small</item>
<item>@drawable/progress_small_holo</item>
<item>@drawable/progress_small_titlebar</item>
<item>@drawable/progress_small_white</item>
<item>@drawable/scrubber_progress_horizontal_holo_dark</item>
<item>@drawable/scrubber_progress_horizontal_holo_light</item>
<item>@drawable/screen_background_dark</item>
<item>@drawable/screen_background_dark_transparent</item>
<item>@drawable/screen_background_light</item>
<item>@drawable/screen_background_light_transparent</item>
<item>@drawable/screen_background_selector_dark</item>
<item>@drawable/screen_background_selector_light</item>
<item>@drawable/scrollbar_handle_holo_dark</item>
<item>@drawable/scrollbar_handle_holo_light</item>
<item>@drawable/scrollbar_handle_horizontal</item>
<item>@drawable/scrollbar_handle_vertical</item>
<item>@drawable/spinner_background_holo_dark</item>
<item>@drawable/spinner_background_holo_light</item>
<item>@drawable/spinner_cab_default_holo_dark</item>
<item>@drawable/spinner_cab_default_holo_light</item>
<item>@drawable/spinner_cab_disabled_holo_dark</item>
<item>@drawable/spinner_cab_disabled_holo_light</item>
<item>@drawable/spinner_cab_focused_holo_dark</item>
<item>@drawable/spinner_cab_focused_holo_light</item>
<item>@drawable/spinner_cab_pressed_holo_dark</item>
<item>@drawable/spinner_cab_pressed_holo_light</item>
<item>@drawable/spinner_default_holo_dark</item>
<item>@drawable/spinner_default_holo_light</item>
<item>@drawable/spinner_disabled_holo_dark</item>
<item>@drawable/spinner_disabled_holo_light</item>
<item>@drawable/spinner_dropdown_background</item>
<item>@drawable/spinner_dropdown_background_down</item>
<item>@drawable/spinner_dropdown_background_up</item>
<item>@drawable/spinner_focused_holo_dark</item>
<item>@drawable/spinner_focused_holo_light</item>
<item>@drawable/spinner_normal</item>
<item>@drawable/spinner_press</item>
<item>@drawable/spinner_pressed_holo_dark</item>
<item>@drawable/spinner_pressed_holo_light</item>
<item>@drawable/spinner_select</item>
<item>@drawable/btn_cab_done</item>
<item>@drawable/btn_cab_done_focused_holo</item>
<item>@drawable/btn_cab_done_holo</item>
<item>@drawable/btn_cab_done_pressed_holo</item>
<item>@drawable/cab_background_light</item>
<item>@drawable/cab_ic_close_focused_holo</item>
<item>@drawable/cab_ic_close_holo</item>
<item>@drawable/cab_ic_close_normal_holo</item>
<item>@drawable/cab_ic_close_pressed_holo</item>
<item>@drawable/ic_cab_close_holo</item>
<item>@drawable/action_bar_background</item>
<item>@drawable/action_bar_divider</item>
<item>@drawable/ic_menu_close_clear_cancel</item>
<item>@drawable/ic_menu_copy_dark</item>
<item>@drawable/ic_menu_copy_light</item>
<item>@drawable/ic_menu_cut_dark</item>
<item>@drawable/ic_menu_cut_light</item>
<item>@drawable/ic_menu_more</item>
<item>@drawable/ic_menu_moreoverflow_holo_dark</item>
<item>@drawable/ic_menu_moreoverflow_holo_light</item>
<item>@drawable/ic_menu_paste_dark</item>
<item>@drawable/ic_menu_paste_light</item>
<item>@drawable/dialog_bottom_holo_dark</item>
<item>@drawable/dialog_bottom_holo_light</item>
<item>@drawable/dialog_full_holo_dark</item>
<item>@drawable/dialog_full_holo_light</item>
<item>@drawable/dialog_middle_holo_dark</item>
<item>@drawable/dialog_middle_holo_light</item>
<item>@drawable/dialog_top_holo_dark</item>
<item>@drawable/dialog_top_holo_light</item>
<item>@drawable/ic_dialog_alert</item>
<item>@drawable/ic_dialog_alert_holo_dark</item>
<item>@drawable/ic_dialog_alert_holo_light</item>
<item>@drawable/list_divider_holo_dark</item>
<item>@drawable/list_divider_holo_light</item>
<!-- Visual lock screen --> <!-- Visual lock screen -->
<item>@drawable/indicator_code_lock_drag_direction_green_up</item> <item>@drawable/indicator_code_lock_drag_direction_green_up</item>
<item>@drawable/indicator_code_lock_drag_direction_red_up</item> <item>@drawable/indicator_code_lock_drag_direction_red_up</item>
@@ -78,18 +275,34 @@
<!-- Do not translate. These are all of the color state list resources that should be <!-- Do not translate. These are all of the color state list resources that should be
preloaded by the zygote process before it starts forking application processes. --> preloaded by the zygote process before it starts forking application processes. -->
<array name="preloaded_color_state_lists"> <array name="preloaded_color_state_lists">
<item>@color/hint_foreground_dark</item>
<item>@color/hint_foreground_light</item>
<item>@color/primary_text_dark</item> <item>@color/primary_text_dark</item>
<item>@color/primary_text_dark_disable_only</item> <item>@color/primary_text_dark_disable_only</item>
<item>@color/primary_text_dark_nodisable</item>
<item>@color/primary_text_disable_only_holo_dark</item>
<item>@color/primary_text_disable_only_holo_light</item>
<item>@color/primary_text_holo_dark</item>
<item>@color/primary_text_holo_light</item>
<item>@color/primary_text_light</item> <item>@color/primary_text_light</item>
<item>@color/primary_text_light_disable_only</item> <item>@color/primary_text_light_disable_only</item>
<item>@color/primary_text_light_nodisable</item> <item>@color/primary_text_light_nodisable</item>
<item>@color/primary_text_nodisable_holo_dark</item>
<item>@color/primary_text_nodisable_holo_light</item>
<item>@color/secondary_text_dark</item> <item>@color/secondary_text_dark</item>
<item>@color/secondary_text_dark_nodisable</item>
<item>@color/secondary_text_holo_dark</item>
<item>@color/secondary_text_holo_light</item>
<item>@color/secondary_text_light</item> <item>@color/secondary_text_light</item>
<item>@color/secondary_text_light_nodisable</item>
<item>@color/secondary_text_nodisable_holo_dark</item>
<item>@color/secondary_text_nodisable_holo_light</item>
<item>@color/secondary_text_nofocus</item>
<item>@color/hint_foreground_dark</item>
<item>@color/hint_foreground_holo_dark</item>
<item>@color/hint_foreground_holo_light</item>
<item>@color/hint_foreground_light</item>
<item>@color/bright_foreground_light</item>
<item>@color/bright_foreground_dark</item>
<item>@color/tab_indicator_text</item> <item>@color/tab_indicator_text</item>
<item>@color/tertiary_text_dark</item>
<item>@color/tertiary_text_light</item>
<item>#ff000000</item> <item>#ff000000</item>
<item>#00000000</item> <item>#00000000</item>
<item>#ffffffff</item> <item>#ffffffff</item>

View File

@@ -1239,7 +1239,7 @@
</style> </style>
<style name="TextAppearance.Holo.Widget.EditText"> <style name="TextAppearance.Holo.Widget.EditText">
<item name="android:textColor">@color/widget_edittext_holo_dark</item> <item name="android:textColor">@android:color/bright_foreground_light</item>
<item name="android:textColorHint">@android:color/hint_foreground_holo_light</item> <item name="android:textColorHint">@android:color/hint_foreground_holo_light</item>
</style> </style>
@@ -1351,7 +1351,7 @@
</style> </style>
<style name="TextAppearance.Holo.Light.Widget.EditText"> <style name="TextAppearance.Holo.Light.Widget.EditText">
<item name="android:textColor">@color/widget_edittext_holo_light</item> <item name="android:textColor">@android:color/bright_foreground_dark</item>
<item name="android:textColorHint">@android:color/hint_foreground_holo_dark</item> <item name="android:textColorHint">@android:color/hint_foreground_holo_dark</item>
</style> </style>